diff options
| author | Maurício Meneghini Fauth <mauricio@fauth.dev> | 2022-06-25 19:06:33 +0300 |
|---|---|---|
| committer | Maurício Meneghini Fauth <mauricio@fauth.dev> | 2022-06-28 07:39:51 +0300 |
| commit | 4a30c8ccbd96e5f7bfaebf1318ee4e3d3ccf6e64 (patch) | |
| tree | 1ad2d33f69b6ad6f106e2e865065754a75d1b88f | |
| parent | bdbf82b11f068dca15e74269212532bf50cccdd0 (diff) | |
Extract keyhandler.js side effects into main.js file
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
| -rw-r--r-- | js/src/keyhandler.js | 3 | ||||
| -rw-r--r-- | js/src/main.js | 3 | ||||
| -rw-r--r-- | libraries/classes/Header.php | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/js/src/keyhandler.js b/js/src/keyhandler.js index 561c9b169c..9ef70b065e 100644 --- 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 index 9a00241c04..83ae7f3028 100644 --- a/js/src/main.js +++ b/js/src/main.js @@ -8,3 +8,6 @@ $(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()); diff --git a/libraries/classes/Header.php b/libraries/classes/Header.php index d38422df0b..c16238d30b 100644 --- a/libraries/classes/Header.php +++ b/libraries/classes/Header.php @@ -132,8 +132,8 @@ class Header $this->scripts->addFile('vendor/jquery/jquery-migrate.js'); $this->scripts->addFile('vendor/sprintf.js'); $this->scripts->addFile('ajax.js'); - $this->scripts->addFile('main.js'); $this->scripts->addFile('keyhandler.js'); + $this->scripts->addFile('main.js'); $this->scripts->addFile('vendor/jquery/jquery-ui.min.js'); $this->scripts->addFile('name-conflict-fixes.js'); $this->scripts->addFile('vendor/bootstrap/bootstrap.bundle.min.js'); |