From 3feb1f73f1ae224fcbb163f5ccfb41a36f33fba8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Tue, 28 Jun 2022 01:46:24 -0300
Subject: [PATCH] Extract side effects from config.js file
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 js/src/config.js             | 3 ---
 js/src/main.js               | 3 +++
 libraries/classes/Header.php | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/js/src/config.js b/js/src/config.js
index 14b181206bd3..756e859a81b1 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 2843654e1106..11b424b8f32a 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 6235586e2a90..d95804732b70 100644
--- 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');