Merge pull request #667 from ONLYOFFICE/feature/nc-24v7.5.4

Release/7.5.4

5 files changed, 23 insertions, 9 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b78ad12..cab2fbc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Change Log
 
+## 7.5.4
+## Changed
+- fix opening editor in new tab
+- fix download as on MacOS
+
 ## 7.5.2
 ## Changed
 - fix translation for v24
diff --git a/appinfo/application.php b/appinfo/application.php
index 3b3065a..bbf013a 100644
--- a/appinfo/application.php
+++ b/appinfo/application.php
@@ -89,10 +89,18 @@ class Application extends App implements IBootstrap {
     }
 
     public function register(IRegistrationContext $context): void {
-        require_once __DIR__ . "/../3rdparty/jwt/BeforeValidException.php";
-        require_once __DIR__ . "/../3rdparty/jwt/ExpiredException.php";
-        require_once __DIR__ . "/../3rdparty/jwt/SignatureInvalidException.php";
-        require_once __DIR__ . "/../3rdparty/jwt/JWT.php";
+        if (!class_exists('\\Firebase\\JWT\\BeforeValidException')) {
+            require_once __DIR__ . "/../3rdparty/jwt/BeforeValidException.php";
+        }
+        if (!class_exists('\\Firebase\\JWT\\ExpiredException')) {
+            require_once __DIR__ . "/../3rdparty/jwt/ExpiredException.php";
+        }
+        if (!class_exists('\\Firebase\\JWT\\SignatureInvalidException')) {
+            require_once __DIR__ . "/../3rdparty/jwt/SignatureInvalidException.php";
+        }
+        if (!class_exists('\\Firebase\\JWT\\JWT')) {
+            require_once __DIR__ . "/../3rdparty/jwt/JWT.php";
+        }
 
         $context->registerService("L10N", function (ContainerInterface $c) {
             return $c->get("ServerContainer")->getL10N($c->get("AppName"));
@@ -301,4 +309,4 @@ class Application extends App implements IBootstrap {
             });
         }
     }
-}
\ No newline at end of file
+}
diff --git a/appinfo/info.xml b/appinfo/info.xml
index f1d8c04..670c404 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -6,7 +6,7 @@
     <description>ONLYOFFICE connector allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.</description>
     <licence>apache</licence>
     <author mail="dev@onlyoffice.com" homepage="https://www.onlyoffice.com/">Ascensio System SIA</author>
-    <version>7.5.2</version>
+    <version>7.5.4</version>
     <namespace>Onlyoffice</namespace>
     <types>
         <prevent_group_restriction/>
diff --git a/controller/editorcontroller.php b/controller/editorcontroller.php
index 7457c92..80b25d3 100644
--- a/controller/editorcontroller.php
+++ b/controller/editorcontroller.php
@@ -264,7 +264,7 @@ class EditorController extends Controller {
             $targetName = $targetFile->getName();
             $targetExt = strtolower(pathinfo($targetName, PATHINFO_EXTENSION));
             $targetKey = $this->fileUtility->getKey($targetFile);
-            
+
             $fileUrl = $this->getUrl($targetFile, $user, $shareToken);
 
             $ext = strtolower(pathinfo($name, PATHINFO_EXTENSION));
diff --git a/js/main.js b/js/main.js
index 2442f47..fb4849d 100644
--- a/js/main.js
+++ b/js/main.js
@@ -164,8 +164,9 @@
     OCA.Onlyoffice.FileClick = function (fileName, context) {
         var fileInfoModel = context.fileInfoModel || context.fileList.getModelForFile(fileName);
         var fileId = context.fileId || fileInfoModel.id;
+        var winEditor = !fileInfoModel && !OCA.Onlyoffice.setting.sameTab ? document : null;
 
-        OCA.Onlyoffice.OpenEditor(fileId, context.dir, fileName, 0, (OCA.Onlyoffice.setting.sameTab ? null : document));
+        OCA.Onlyoffice.OpenEditor(fileId, context.dir, fileName, 0, winEditor);
 
         OCA.Onlyoffice.context = context;
         OCA.Onlyoffice.context.fileName = fileName;
@@ -217,7 +218,7 @@
                 $(optionNodeOrigin).text(t(OCA.Onlyoffice.AppName, "Origin format"));
 
                 dialog[0].dataset.format = extension;
-                selectNode.onclick = function() {
+                selectNode.onchange = function() {
                     dialog[0].dataset.format = $("#onlyoffice-download-select option:selected").attr("data-value");
                 }