Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaurício Meneghini Fauth <mauricio@fauth.dev>2022-06-28 07:46:24 +0300
committerMaurício Meneghini Fauth <mauricio@fauth.dev>2022-06-28 07:46:24 +0300
commit3feb1f73f1ae224fcbb163f5ccfb41a36f33fba8 (patch)
tree8117d9fe524215075a40d6db2fcfd11844d7adab
parent3560dcfdd443adce0c12409c25077b31065f004e (diff)
Extract side effects from config.js file
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
-rw-r--r--js/src/config.js3
-rw-r--r--js/src/main.js3
-rw-r--r--libraries/classes/Header.php2
3 files changed, 4 insertions, 4 deletions
diff --git a/js/src/config.js b/js/src/config.js
index 14b181206b..756e859a81 100644
--- 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
index 2843654e11..11b424b8f3 100644
--- 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
index 6235586e2a..d95804732b 100644
--- a/libraries/classes/Header.php
+++ b/libraries/classes/Header.php
@@ -141,9 +141,9 @@ class Header
$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');