Merge pull request #17615 from MauricioFauth/main-js-file

MauricioFauth · web-flow · commit 14f90d77f8a5 · 2022-06-28T14:25:23.000-03:00
Move side effects from JS files into the `main.js` file
diff --git a/js/src/ajax.js b/js/src/ajax.js
@@ -936,18 +936,3 @@ window.AJAX = {
         };
     }
 };
-
-window.AJAX.registerOnload('functions.js', function () {
-    window.AJAX.removeSubmitEvents();
-});
-
-$(window.AJAX.loadEventHandler());
-
-/**
- * Attach a generic event handler to clicks
- * on pages and submissions of forms
- */
-$(document).on('click', 'a', window.AJAX.requestHandler);
-$(document).on('submit', 'form', window.AJAX.requestHandler);
-
-$(document).on('ajaxError', window.AJAX.getFatalErrorHandler());
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/cross_framing_protection.js b/js/src/cross_framing_protection.js
@@ -2,7 +2,7 @@
  * Conditionally included if framing is not allowed.
  * @return {void}
  */
-const crossFramingProtection = () => {
+window.crossFramingProtection = () => {
     if (window.allowThirdPartyFraming) {
         return;
     }
@@ -20,5 +20,3 @@ const crossFramingProtection = () => {
 
     styleElement.parentNode.removeChild(styleElement);
 };
-
-crossFramingProtection();
diff --git a/js/src/keyhandler.js b/js/src/keyhandler.js
@@ -151,6 +151,3 @@ const KeyHandlerEvents = {
 };
 
 window.KeyHandlerEvents = KeyHandlerEvents;
-
-window.AJAX.registerTeardown('keyhandler.js', window.KeyHandlerEvents.off());
-window.AJAX.registerOnload('keyhandler.js', window.KeyHandlerEvents.on());
diff --git a/js/src/main.js b/js/src/main.js
@@ -0,0 +1,18 @@
+window.AJAX.registerOnload('functions.js', () => window.AJAX.removeSubmitEvents());
+$(window.AJAX.loadEventHandler());
+
+/**
+ * Attach a generic event handler to clicks on pages and submissions of forms.
+ */
+$(document).on('click', 'a', window.AJAX.requestHandler);
+$(document).on('submit', 'form', window.AJAX.requestHandler);
+
+$(document).on('ajaxError', window.AJAX.getFatalErrorHandler());
+
+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
@@ -143,6 +143,7 @@ private function addDefaultScripts(): void
         $this->scripts->addFile('cross_framing_protection.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');
diff --git a/webpack.config.js b/webpack.config.js
@@ -49,6 +49,7 @@ module.exports = [
             'jqplot/plugins/jqplot.byteFormatter': './js/src/jqplot/plugins/jqplot.byteFormatter.js',
             'jquery.sortable-table': './js/src/jquery.sortable-table.js',
             'keyhandler': './js/src/keyhandler.js',
+            'main': './js/src/main.js',
             'makegrid': './js/src/makegrid.js',
             'menu_resizer': './js/src/menu_resizer.js',
             'multi_column_sort': './js/src/multi_column_sort.js',

Original file line number	Diff line number	Diff line change
`@@ -824,6 +824,3 @@ window.Config = {`
`824`	`824`	`};`
`825`	`825`	`}`
`826`	`826`	`};`
`827`		`-`
`828`		`-window.AJAX.registerTeardown('config.js', window.Config.off());`
`829`		`-window.AJAX.registerOnload('config.js', window.Config.on());`