fix the collapsible

joomla · Apr 20, 2017 · 1d60931 · 1d60931
1 parent 66a3f94
commit 1d60931
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/libraries/cms/html/bootstrap.php b/libraries/cms/html/bootstrap.php
@@ -395,7 +395,7 @@ public static function startAccordion($selector = 'myAccordian', $params = array
 		JHtml::_('bootstrap.framework');
 
 		// Setup options object
-		$opt['parent'] = isset($params['parent']) ? ($params['parent'] == true ? '#' . $selector : $params['parent']) : false;
+		$opt['parent'] = isset($params['parent']) ? ($params['parent'] == true ? '#' . $selector : $params['parent']) : '';
 		$opt['toggle'] = isset($params['toggle']) ? (boolean) $params['toggle'] : ($opt['parent'] === false || isset($params['active']) ? false : true);
 		$opt['onShow'] = isset($params['onShow']) ? (string) $params['onShow'] : null;
 		$opt['onShown'] = isset($params['onShown']) ? (string) $params['onShown'] : null;

diff --git a/media/system/js/bootstrap-init.js b/media/system/js/bootstrap-init.js
@@ -72,15 +72,6 @@
 						var modalBody = $self.find('.modal-body');
 						modalBody.find('iframe').remove();
 						modalBody.prepend($self.data('iframe'));
-						$('.modalTooltip').tooltip({'html': true, 'container': '#' + $self.prop('id')});
-					} else {
-						$('.modalTooltip').each(function(){
-							var $el = $(this);
-							var attr = $el.attr('data-placement');
-							if ( attr === undefined || attr === false ) {
-								$el.attr('data-placement', 'auto-dir top-left');
-							}
-						});
 					}
 				}).on('shown.bs.modal', function() {
 					var modalHeight = $('div.modal:visible').outerHeight(true),

diff --git a/media/system/js/bootstrap-init.min.js b/media/system/js/bootstrap-init.min.js