Remove PageSettings from the window object

MauricioFauth · MauricioFauth · commit 2e001c186af6 · 2022-11-24T22:00:56.000-03:00
Imports PageSettings in the main.js file instead of relying on the
global window object.

Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/js/src/main.js b/js/src/main.js
@@ -2,6 +2,7 @@ import $ from 'jquery';
 import { AJAX } from './ajax.js';
 import { Functions } from './functions.js';
 import { Navigation } from './navigation.js';
+import { PageSettings } from './page_settings.js';
 
 /* global Indexes */
 
@@ -41,5 +42,10 @@ AJAX.registerOnload('indexes.js', Indexes.on());
 
 $(() => Functions.checkNumberOfFields());
 
-AJAX.registerTeardown('page_settings.js', window.PageSettings.off());
-AJAX.registerOnload('page_settings.js', window.PageSettings.on());
+AJAX.registerTeardown('main.js', () => {
+    PageSettings.off();
+});
+
+AJAX.registerOnload('main.js', () => {
+    PageSettings.on();
+});
diff --git a/js/src/page_settings.js b/js/src/page_settings.js
@@ -33,18 +33,26 @@ function showNaviSettings () {
     showSettings('#pma_navigation_settings');
 }
 
-window.PageSettings = {};
-
-window.PageSettings.off = () => function () {
-    $('#page_settings_icon').css('display', 'none');
-    $('#page_settings_icon').off('click');
-    $('#pma_navigation_settings_icon').off('click');
+const PageSettings = {
+    /**
+     * @return {void}
+     */
+    off: () => {
+        $('#page_settings_icon').css('display', 'none');
+        $('#page_settings_icon').off('click');
+        $('#pma_navigation_settings_icon').off('click');
+    },
+
+    /**
+     * @return {void}
+     */
+    on: () => {
+        if ($('#page_settings_modal').length) {
+            $('#page_settings_icon').css('display', 'inline');
+            $('#page_settings_icon').on('click', showPageSettings);
+        }
+        $('#pma_navigation_settings_icon').on('click', showNaviSettings);
+    },
 };
 
-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);
-};
+export { PageSettings };
diff --git a/libraries/classes/Header.php b/libraries/classes/Header.php
@@ -147,7 +147,6 @@ private function addDefaultScripts(): void
         $this->scripts->addFile('navigation.js');
         $this->scripts->addFile('indexes.js');
         $this->scripts->addFile('common.js');
-        $this->scripts->addFile('page_settings.js');
         $this->scripts->addFile('main.js');
 
         $this->scripts->addCode($this->getJsParamsCode());
diff --git a/test/classes/HeaderTest.php b/test/classes/HeaderTest.php
@@ -269,7 +269,6 @@ public function testAddedDefaultScripts(): void
             ['name' => 'navigation.js', 'fire' => 1],
             ['name' => 'indexes.js', 'fire' => 1],
             ['name' => 'common.js', 'fire' => 1],
-            ['name' => 'page_settings.js', 'fire' => 1],
             ['name' => 'main.js', 'fire' => 1],
         ];
         $this->assertSame($expected, $scripts->getFiles());
diff --git a/webpack.config.cjs b/webpack.config.cjs
@@ -53,7 +53,6 @@ module.exports = [
             'name-conflict-fixes': './js/src/name-conflict-fixes.js',
             'navigation': './js/src/navigation.js',
             'normalization': './js/src/normalization.js',
-            'page_settings': './js/src/page_settings.js',
             'replication': './js/src/replication.js',
             'server/databases': './js/src/server/databases.js',
             'server/plugins': './js/src/server/plugins.js',
