diff options
| author | Maurício Meneghini Fauth <mauricio@fauth.dev> | 2022-06-28 03:40:18 +0300 |
|---|---|---|
| committer | Maurício Meneghini Fauth <mauricio@fauth.dev> | 2022-06-28 07:39:52 +0300 |
| commit | 3560dcfdd443adce0c12409c25077b31065f004e (patch) | |
| tree | 4c86c0f11395f7092e4cecac5576f9fcce96f134 | |
| parent | 4a30c8ccbd96e5f7bfaebf1318ee4e3d3ccf6e64 (diff) | |
Extract cross_framing_protection.js side effect into main.js
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
| -rw-r--r-- | js/src/cross_framing_protection.js | 4 | ||||
| -rw-r--r-- | js/src/main.js | 2 | ||||
| -rw-r--r-- | libraries/classes/Header.php | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/js/src/cross_framing_protection.js b/js/src/cross_framing_protection.js index e25e60ab51..c43e7958e6 100644 --- 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/main.js b/js/src/main.js index 83ae7f3028..2843654e11 100644 --- a/js/src/main.js +++ b/js/src/main.js @@ -11,3 +11,5 @@ $(document).on('ajaxError', window.AJAX.getFatalErrorHandler()); window.AJAX.registerTeardown('keyhandler.js', window.KeyHandlerEvents.off()); window.AJAX.registerOnload('keyhandler.js', window.KeyHandlerEvents.on()); + +window.crossFramingProtection(); diff --git a/libraries/classes/Header.php b/libraries/classes/Header.php index c16238d30b..6235586e2a 100644 --- a/libraries/classes/Header.php +++ b/libraries/classes/Header.php @@ -133,7 +133,6 @@ class Header $this->scripts->addFile('vendor/sprintf.js'); $this->scripts->addFile('ajax.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'); @@ -142,6 +141,7 @@ class Header $this->scripts->addFile('vendor/jquery/jquery-ui-timepicker-addon.js'); $this->scripts->addFile('menu_resizer.js'); $this->scripts->addFile('cross_framing_protection.js'); + $this->scripts->addFile('main.js'); $this->scripts->addFile('messages.php', ['l' => $GLOBALS['lang']]); $this->scripts->addFile('config.js'); $this->scripts->addFile('doclinks.js'); |