Merge remote-tracking branch 'remotes/origin/develop' into feature/nc-27

ONLYOFFICE · Nov 30, 2023 · 5f3d113 · 5f3d113
2 parents 11413a1 + ba2224e
commit 5f3d113
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/lib/Controller/EditorController.php b/lib/Controller/EditorController.php
@@ -1270,7 +1270,6 @@ public function index($fileId, $filePath = null, $shareToken = null, $version =
         \OCP\Util::addHeader("meta", ["name" => "apple-touch-fullscreen", "content" => "yes"]);
 
         $csp = new ContentSecurityPolicy();
-        $csp->allowInlineScript(true);
 
         if (preg_match("/^https?:\/\//i", $documentServerUrl)) {
             $csp->addAllowedScriptDomain($documentServerUrl);

diff --git a/lib/DirectEditor.php b/lib/DirectEditor.php
@@ -247,7 +247,6 @@ public function open(IToken $token): Response {
             $response = new TemplateResponse($this->appName, "editor", $params, "base");
 
             $csp = new ContentSecurityPolicy();
-            $csp->allowInlineScript(true);
 
             if (preg_match("/^https?:\/\//i", $documentServerUrl)) {
                 $csp->addAllowedScriptDomain($documentServerUrl);

diff --git a/src/editor.js b/src/editor.js
@@ -183,7 +183,7 @@
                             config.events.onRequestHistory = OCA.Onlyoffice.onRequestHistory;
                             config.events.onRequestHistoryData = OCA.Onlyoffice.onRequestHistoryData;
                             config.events.onRequestRestore = OCA.Onlyoffice.onRequestRestore;
-    
+
                             if (!OCA.Onlyoffice.version) {
                                 config.events.onRequestHistoryClose = OCA.Onlyoffice.onRequestHistoryClose;
                             }

diff --git a/src/main.js b/src/main.js
@@ -33,8 +33,8 @@
         var dir = fileList.getCurrentDirectory();
 
         if ((!OCA.Onlyoffice.setting.sameTab || OCA.Onlyoffice.mobile || OCA.Onlyoffice.Desktop) && open) {
-            $loaderUrl = OCA.Onlyoffice.Desktop ? "" : OC.filePath(OCA.Onlyoffice.AppName, "templates", "loader.html");
-            var winEditor = window.open($loaderUrl);
+            var loaderUrl = OCA.Onlyoffice.Desktop ? "" : OC.filePath(OCA.Onlyoffice.AppName, "templates", "loader.html");
+            var winEditor = window.open(loaderUrl);
         }
 
         var createData = {