Initialize tooltips when a new a row is added in a subform (#12996)

* Initialize tooltips when a new a row is added in a subform * Fix a test since the init function has changed * Replace htaccess which was removed inexplicably
joomla · Apr 29, 2018 · 9780ed3 · 9780ed3
1 parent a6e20f9
commit 9780ed3
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/libraries/cms/html/bootstrap.php b/libraries/cms/html/bootstrap.php
@@ -466,7 +466,7 @@ public static function tooltip($selector = '.hasTooltip', $params = array())
 			$options = JHtml::getJSObject($opt);
 
 			// Build the script.
-			$script = array('$(' . json_encode($selector) . ').tooltip(' . $options . ')');
+			$script = array('$(container).find(' . json_encode($selector) . ').tooltip(' . $options . ')');
 
 			if ($onShow)
 			{
@@ -488,8 +488,14 @@ public static function tooltip($selector = '.hasTooltip', $params = array())
 				$script[] = 'on("hidden.bs.tooltip", ' . $onHidden . ')';
 			}
 
+			$initFunction = 'function initTooltips (event, container) { ' .
+				'container = container || document;' .
+				implode('.', $script) . ';' .
+				'}';
+
 			// Attach tooltips to document
-			JFactory::getDocument()->addScriptDeclaration('jQuery(function($){ ' . implode('.', $script) . '; });');
+			JFactory::getDocument()
+				->addScriptDeclaration('jQuery(function($){ initTooltips(); $("body").on("subform-row-add", initTooltips); ' . $initFunction . ' });');
 
 			// Set static array
 			static::$loaded[__METHOD__][$selector] = true;

diff --git a/media/system/js/subform-repeatable-uncompressed.js b/media/system/js/subform-repeatable-uncompressed.js
@@ -239,11 +239,6 @@
 			$row.find('.field-media-wrapper').fieldMedia();
 		}
 
-		// bootstrap tooltips
-		if($.fn.tooltip){
-			$row.find('.hasTooltip').tooltip({html: true, container: "body"});
-		}
-
 		// bootstrap based User field
 		if($.fn.fieldUser){
 			$row.find('.field-user-wrapper').fieldUser();

diff --git a/media/system/js/subform-repeatable.js b/media/system/js/subform-repeatable.js
diff --git a/tests/unit/suites/libraries/cms/html/JHtmlBootstrapTest.php b/tests/unit/suites/libraries/cms/html/JHtmlBootstrapTest.php
@@ -382,9 +382,9 @@ public function testTooltip()
 			'Verify that the alert method initialises Bootstrap as well'
 		);
 
-		$this->assertEquals(
+		$this->assertContains(
+			'jQuery(function($){ initTooltips();',
 			$document->_script['text/javascript'],
-			'jQuery(function($){ $(".hasTooltip").tooltip({"html": true,"container": "body"}); });',
 			'Verify that the tooltip script is initialised'
 		);
 	}