Remove KeyHandlerEvents from the Window global object

MauricioFauth · MauricioFauth · commit 332e27ad39fa · 2022-11-28T23:11:13.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/js/src/keyhandler.js b/js/src/keyhandler.js
@@ -151,4 +151,4 @@ const KeyHandlerEvents = {
     }
 };
 
-window.KeyHandlerEvents = KeyHandlerEvents;
+export { KeyHandlerEvents };
diff --git a/js/src/main.js b/js/src/main.js
@@ -1,6 +1,7 @@
 import $ from 'jquery';
 import { AJAX } from './ajax.js';
 import { Functions } from './functions.js';
+import { KeyHandlerEvents } from './keyhandler.js';
 import { Navigation } from './navigation.js';
 import { PageSettings } from './page_settings.js';
 
@@ -17,8 +18,8 @@ $(document).on('submit', 'form', AJAX.requestHandler);
 
 $(document).on('ajaxError', AJAX.getFatalErrorHandler());
 
-AJAX.registerTeardown('keyhandler.js', window.KeyHandlerEvents.off());
-AJAX.registerOnload('keyhandler.js', window.KeyHandlerEvents.on());
+AJAX.registerTeardown('main.js', KeyHandlerEvents.off());
+AJAX.registerOnload('main.js', KeyHandlerEvents.on());
 
 window.crossFramingProtection();
 
diff --git a/js/src/multi_column_sort.js b/js/src/multi_column_sort.js
@@ -11,7 +11,7 @@ import { CommonParams } from './common.js';
  * @requires    jQuery
  */
 
-AJAX.registerOnload('keyhandler.js', function () {
+AJAX.registerOnload('multi_column_sort.js', function () {
     $('th.draggable.column_heading.pointer.marker a').on('click', function (event) {
         var orderUrlRemove = $(this).parent().find('input[name="url-remove-order"]').val();
         var orderUrlAdd = $(this).parent().find('input[name="url-add-order"]').val();
@@ -32,6 +32,6 @@ AJAX.registerOnload('keyhandler.js', function () {
     });
 });
 
-AJAX.registerTeardown('keyhandler.js', function () {
+AJAX.registerTeardown('multi_column_sort.js', function () {
     $(document).off('click', 'th.draggable.column_heading.pointer.marker a');
 });
diff --git a/libraries/classes/Header.php b/libraries/classes/Header.php
@@ -140,7 +140,6 @@ private function addDefaultScripts(): void
         $this->scripts->addFile('vendor/jquery/jquery-ui-timepicker-addon.js');
         $this->scripts->addFile('index.php', ['route' => '/messages', 'l' => $GLOBALS['lang']]);
         $this->scripts->addFile('shared.js');
-        $this->scripts->addFile('keyhandler.js');
         $this->scripts->addFile('menu_resizer.js');
         $this->scripts->addFile('cross_framing_protection.js');
         $this->scripts->addFile('config.js');
diff --git a/test/classes/HeaderTest.php b/test/classes/HeaderTest.php
@@ -262,7 +262,6 @@ public function testAddedDefaultScripts(): void
             ['name' => 'vendor/jquery/jquery-ui-timepicker-addon.js', 'fire' => 0],
             ['name' => 'index.php', 'fire' => 0],
             ['name' => 'shared.js', 'fire' => 0],
-            ['name' => 'keyhandler.js', 'fire' => 1],
             ['name' => 'menu_resizer.js', 'fire' => 1],
             ['name' => 'cross_framing_protection.js', 'fire' => 0],
             ['name' => 'config.js', 'fire' => 1],
diff --git a/webpack.config.cjs b/webpack.config.cjs
@@ -45,7 +45,6 @@ module.exports = [
             'indexes': './js/src/indexes.js',
             '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',

Original file line number	Diff line number	Diff line change
`@@ -151,4 +151,4 @@ const KeyHandlerEvents = {`
`151`	`151`	`}`
`152`	`152`	`};`
`153`	`153`
`154`		`-window.KeyHandlerEvents = KeyHandlerEvents;`
	`154`	`+export { KeyHandlerEvents };`