Extract side effects from page_settings.js file

MauricioFauth · MauricioFauth · commit ef299ea809ae · 2022-06-30T02:01:21.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/js/src/main.js b/js/src/main.js
@@ -35,3 +35,6 @@ window.AJAX.registerTeardown('indexes.js', Indexes.off());
 window.AJAX.registerOnload('indexes.js', Indexes.on());
 
 $(() => Functions.checkNumberOfFields());
+
+window.AJAX.registerTeardown('page_settings.js', window.PageSettings.off());
+window.AJAX.registerOnload('page_settings.js', window.PageSettings.on());
diff --git a/js/src/page_settings.js b/js/src/page_settings.js
@@ -33,16 +33,18 @@ function showNaviSettings () {
     showSettings('#pma_navigation_settings');
 }
 
-window.AJAX.registerTeardown('page_settings.js', function () {
+window.PageSettings = {};
+
+window.PageSettings.off = () => function () {
     $('#page_settings_icon').css('display', 'none');
     $('#page_settings_icon').off('click');
     $('#pma_navigation_settings_icon').off('click');
-});
+};
 
-window.AJAX.registerOnload('page_settings.js', function () {
+window.PageSettings.on = () => function () {
     if ($('#page_settings_modal').length) {
         $('#page_settings_icon').css('display', 'inline');
         $('#page_settings_icon').on('click', showPageSettings);
     }
     $('#pma_navigation_settings_icon').on('click', showNaviSettings);
-});
+};
diff --git a/libraries/classes/Header.php b/libraries/classes/Header.php
@@ -148,8 +148,8 @@ private function addDefaultScripts(): void
         $this->scripts->addFile('navigation.js');
         $this->scripts->addFile('indexes.js');
         $this->scripts->addFile('common.js');
-        $this->scripts->addFile('main.js');
         $this->scripts->addFile('page_settings.js');
+        $this->scripts->addFile('main.js');
 
         $this->scripts->addCode($this->getJsParamsCode());
     }

Original file line number	Diff line number	Diff line change
`@@ -148,8 +148,8 @@ private function addDefaultScripts(): void`
`148`	`148`	`$this->scripts->addFile('navigation.js');`
`149`	`149`	`$this->scripts->addFile('indexes.js');`
`150`	`150`	`$this->scripts->addFile('common.js');`
`151`		`- $this->scripts->addFile('main.js');`
`152`	`151`	`$this->scripts->addFile('page_settings.js');`
	`152`	`+ $this->scripts->addFile('main.js');`
`153`	`153`
`154`	`154`	`$this->scripts->addCode($this->getJsParamsCode());`
`155`	`155`	`}`