[4.0] Mitigate some b/c breaks2 (#32357)

joomla · Feb 12, 2021 · e5a8e52 · e5a8e52
1 parent 8075b01
commit e5a8e52
Show file tree

Hide file tree

Showing 8 changed files with 165 additions and 137 deletions.
diff --git a/administrator/components/com_mails/tmpl/templates/default.php b/administrator/components/com_mails/tmpl/templates/default.php
@@ -14,7 +14,7 @@
 use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\CMS\Router\Route;
 
-HTMLHelper::_('bootstrap.dropdown');
+HTMLHelper::_('bootstrap.dropdown', '.dropdown-toggle');
 
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn = $this->escape($this->state->get('list.direction'));

diff --git a/build/media_source/vendor/bootstrap/js/tab.es6.js b/build/media_source/vendor/bootstrap/js/tab.es6.js
@@ -12,11 +12,7 @@ window.bootstrap.Tab = Tab;
  */
 Joomla.initialiseTabs = (el, options) => {
   if (!(el instanceof Element) && options.isJoomla) {
-    const nSelector = el.split('.')[1];
-    if (!nSelector) {
-      throw new Error('The selector is invalid, check your PHP side');
-    }
-    const tab = document.querySelector(`#${nSelector}Content`);
+    const tab = document.querySelector(`${el}Content`);
     if (tab) {
       const related = Array.from(tab.children);
 
@@ -28,7 +24,7 @@ Joomla.initialiseTabs = (el, options) => {
           }
 
           const isActive = element.dataset.active !== '';
-          const ul = document.querySelector(`#${nSelector}Tabs`);
+          const ul = document.querySelector(`${el}Tabs`);
 
           if (ul) {
             const link = document.createElement('a');

diff --git a/components/com_users/tmpl/profile/edit.php b/components/com_users/tmpl/profile/edit.php
@@ -14,7 +14,7 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 
-HTMLHelper::_('bootstrap.tooltip');
+HTMLHelper::_('bootstrap.tooltip', '.hasTooltip');
 
 // Load user_profile plugin language
 $lang = Factory::getLanguage();

diff --git a/layouts/libraries/html/bootstrap/tab/addtab.php b/layouts/libraries/html/bootstrap/tab/addtab.php
@@ -11,10 +11,9 @@
 
 $id       = empty($displayData['id']) ? '' : $displayData['id'];
 $active   = empty($displayData['active']) ? '' : $displayData['active'];
-$selector = empty($displayData['selector']) ? '' : $displayData['selector'];
 $title    = empty($displayData['title']) ? '' : $displayData['title'];
 ?>
-<div id="<?php echo $id; ?>"
+<div id="<?php echo preg_replace('/^[\.#]/', '', $id); ?>"
 	class="tab-pane<?php echo $active; ?>"
 	data-active="<?php echo trim(htmlspecialchars($active, ENT_COMPAT, 'UTF-8')); ?>"
 	data-id="<?php echo  htmlspecialchars($id, ENT_COMPAT, 'UTF-8'); ?>"

diff --git a/layouts/libraries/html/bootstrap/tab/starttabset.php b/layouts/libraries/html/bootstrap/tab/starttabset.php
@@ -10,9 +10,7 @@
 defined('_JEXEC') or die;
 
 $selector = empty($displayData['selector']) ? '' : $displayData['selector'];
-
-$selector = ltrim($selector, '.');
 ?>
 
-<ul class="joomla-tabs nav nav-tabs" id="<?php echo $selector; ?>Tabs" role="tablist"></ul>
+<ul class="joomla-tabs nav nav-tabs" id="<?php echo preg_replace('/^[\.#]/', '', $selector); ?>Tabs" role="tablist"></ul>
 <div class="tab-content" id="<?php echo $selector; ?>Content">
diff --git a/libraries/src/Form/Field/SpacerField.php b/libraries/src/Form/Field/SpacerField.php
@@ -83,7 +83,7 @@ protected function getLabel()
 			// If a description is specified, use it to build a tooltip.
 			if (!empty($this->description))
 			{
-				HTMLHelper::_('bootstrap.popover');
+				HTMLHelper::_('bootstrap.popover', '.hasPopover');
 				$label .= ' title="' . htmlspecialchars(trim($text, ':'), ENT_COMPAT, 'UTF-8') . '"';
 				$label .= ' data-bs-content="' . htmlspecialchars(
 					$this->translateDescription ? Text::_($this->description) : $this->description,