Call the popover init function when creating new subform rows. (#20222)

* Call the popover init function when creating new subform rows. * Update teh popover test
joomla · Apr 29, 2018 · c12c682 · c12c682
1 parent 49e681f
commit c12c682
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/libraries/cms/html/bootstrap.php b/libraries/cms/html/bootstrap.php
@@ -364,9 +364,13 @@ public static function popover($selector = '.hasPopover', $params = array())
 
 		$options = JHtml::getJSObject($opt);
 
+		$initFunction = 'function initPopovers (event, container) { ' .
+				'$(container || document).find(' . json_encode($selector) . ').popover(' . $options . ');' .
+			'}';
+
 		// Attach the popover to the document
 		JFactory::getDocument()->addScriptDeclaration(
-			'jQuery(function($){ $(' . json_encode($selector) . ').popover(' . $options . '); });'
+			'jQuery(function($){ initPopovers(); $("body").on("subform-row-add", initPopovers); ' . $initFunction . ' });'
 		);
 
 		static::$loaded[__METHOD__][$selector] = true;

diff --git a/tests/unit/suites/libraries/cms/html/JHtmlBootstrapTest.php b/tests/unit/suites/libraries/cms/html/JHtmlBootstrapTest.php
@@ -328,7 +328,7 @@ public function testPopover()
 
 		$this->assertEquals(
 			$document->_script['text/javascript'],
-			'jQuery(function($){ $(".hasPopover").popover({"html": true,"trigger": "hover focus","container": "body"}); });',
+			'jQuery(function($){ initPopovers(); $("body").on("subform-row-add", initPopovers); function initPopovers (event, container) { $(container || document).find(".hasPopover").popover({"html": true,"trigger": "hover focus","container": "body"});} });',
 			'Verify that the popover script is initialised'
 		);
 	}