revert search tools add missing jQuery

joomla · Jan 23, 2021 · b8480ac · b8480ac
1 parent e3599b2
commit b8480ac
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 17 deletions.
diff --git a/administrator/components/com_joomlaupdate/tmpl/update/default.php b/administrator/components/com_joomlaupdate/tmpl/update/default.php
@@ -16,6 +16,7 @@
 /** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
 $wa = $this->document->getWebAssetManager();
 $wa->useScript('core')
+	->useScript('jquery')
 	->useScript('com_joomlaupdate.encryption')
 	->useScript('com_joomlaupdate.update')
 	->useScript('com_joomlaupdate.admin-update');

diff --git a/administrator/components/com_joomlaupdate/tmpl/upload/captive.php b/administrator/components/com_joomlaupdate/tmpl/upload/captive.php
@@ -20,6 +20,7 @@
 /** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
 $wa = $this->document->getWebAssetManager();
 $wa->useScript('core')
+	->useScript('jquery')
 	->useScript('form.validate')
 	->useScript('keepalive')
 	->useScript('field.passwordview');

diff --git a/build/media_source/com_joomlaupdate/joomla.asset.json b/build/media_source/com_joomlaupdate/joomla.asset.json
@@ -10,7 +10,8 @@
       "type": "script",
       "uri": "com_joomlaupdate/admin-update-default.min.js",
       "dependencies": [
-        "core"
+        "core",
+        "jquery"
       ],
       "attributes": {
         "defer": true
@@ -21,7 +22,8 @@
       "type": "script",
       "uri": "com_joomlaupdate/default.min.js",
       "dependencies": [
-        "core"
+        "core",
+        "jquery"
       ],
       "attributes": {
         "defer": true

diff --git a/build/media_source/system/js/searchtools.es6.js b/build/media_source/system/js/searchtools.es6.js
@@ -250,8 +250,6 @@ Joomla = window.Joomla || {};
           i.value = '';
           self.checkFilter(i);
 
-          // Trigger an update
-          i.dispatchEvent(new Event('change'));
           if (window.jQuery && window.jQuery.chosen) {
             window.jQuery(i).trigger('chosen:updated');
           }
@@ -263,8 +261,6 @@ Joomla = window.Joomla || {};
           i.value = '';
           self.checkFilter(i);
 
-          // Trigger an update
-          i.dispatchEvent(new Event('change'));
           if (window.jQuery && window.jQuery.chosen) {
             window.jQuery(i).trigger('chosen:updated');
           }
@@ -273,12 +269,6 @@ Joomla = window.Joomla || {};
         // Special case to limit box to the default config limit
         document.querySelector('#list_limit').value = self.options.defaultLimit;
 
-        // Trigger an update
-        const listLimitEl = document.getElementById('list_limit');
-        if (listLimitEl) {
-          listLimitEl.dispatchEvent(new Event('change'));
-        }
-
         if (window.jQuery && window.jQuery.chosen) {
           window.jQuery('#list_limit').trigger('chosen:updated');
         }
@@ -481,8 +471,6 @@ Joomla = window.Joomla || {};
           }
         });
 
-        // Trigger an update
-        this.orderField.dispatchEvent(new Event('change'));
         if (window.jQuery && window.jQuery.chosen) {
           window.jQuery(this.orderField).trigger('chosen:updated');
         }
@@ -522,9 +510,7 @@ Joomla = window.Joomla || {};
         }
 
         field.value = newValue;
-
-        // Trigger an update
-        field.dispatchEvent(new Event('change'));
+        // Trigger the chosen update
         if (window.jQuery && window.jQuery.chosen) {
           field.trigger('chosen:updated');
         }