Extract side effects from config.js file

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
phpmyadmin · Jun 28, 2022 · 3feb1f7 · 3feb1f7
1 parent 3560dcf
commit 3feb1f7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/js/src/config.js b/js/src/config.js
@@ -824,6 +824,3 @@ window.Config = {
         };
     }
 };
-
-window.AJAX.registerTeardown('config.js', window.Config.off());
-window.AJAX.registerOnload('config.js', window.Config.on());
diff --git a/js/src/main.js b/js/src/main.js
@@ -13,3 +13,6 @@ window.AJAX.registerTeardown('keyhandler.js', window.KeyHandlerEvents.off());
 window.AJAX.registerOnload('keyhandler.js', window.KeyHandlerEvents.on());
 
 window.crossFramingProtection();
+
+window.AJAX.registerTeardown('config.js', window.Config.off());
+window.AJAX.registerOnload('config.js', window.Config.on());
diff --git a/libraries/classes/Header.php b/libraries/classes/Header.php
@@ -141,9 +141,9 @@ private function addDefaultScripts(): void
         $this->scripts->addFile('vendor/jquery/jquery-ui-timepicker-addon.js');
         $this->scripts->addFile('menu_resizer.js');
         $this->scripts->addFile('cross_framing_protection.js');
-        $this->scripts->addFile('main.js');
         $this->scripts->addFile('messages.php', ['l' => $GLOBALS['lang']]);
         $this->scripts->addFile('config.js');
+        $this->scripts->addFile('main.js');
         $this->scripts->addFile('doclinks.js');
         $this->scripts->addFile('functions.js');
         $this->scripts->addFile('navigation.js');