open file editor in same tab (Issue #48)

2 files changed, 20 insertions, 8 deletions

diff --git a/js/main.js b/js/main.js
index 833669c..6d43804 100644
--- a/js/main.js
+++ b/js/main.js
@@ -32,13 +32,17 @@
         };
     }
 
+    OCA.Onlyoffice.setting = {};
+
     OCA.Onlyoffice.CreateFile = function (name, fileList) {
         var dir = fileList.getCurrentDirectory();
 
-        var winEditor = window.open("");
-        if (winEditor) {
-            winEditor.document.write(t(OCA.Onlyoffice.AppName, "Loading, please wait."));
-            winEditor.document.close();
+        if (!OCA.Onlyoffice.setting.sameTab) {
+            var winEditor = window.open("");
+            if (winEditor) {
+                winEditor.document.write(t(OCA.Onlyoffice.AppName, "Loading, please wait."));
+                winEditor.document.close();
+            }
         }
 
         $.post(OC.generateUrl("apps/" + OCA.Onlyoffice.AppName + "/ajax/new"),
@@ -48,7 +52,9 @@
             },
             function onSuccess(response) {
                 if (response.error) {
-                    winEditor.close();
+                    if (winEditor) {
+                        winEditor.close();
+                    }
                     var row = OC.Notification.show(response.error);
                     setTimeout(function () {
                         OC.Notification.hide(row);
@@ -75,8 +81,10 @@
 
         if (winEditor && winEditor.location) {
             winEditor.location.href = url;
-        } else {
+        } else if (!OCA.Onlyoffice.setting.sameTab) {
             winEditor = window.open(url, "_blank");
+        } else {
+            location.href = url;
         }
     };
 
@@ -128,7 +136,8 @@
 
             $.get(OC.generateUrl("apps/" + OCA.Onlyoffice.AppName + "/ajax/settings"),
                 function onSuccess(settings) {
-                    var mimes = settings.formats;
+                    OCA.Onlyoffice.setting = settings;
+                    var mimes = OCA.Onlyoffice.setting.formats;
 
                     OCA.Onlyoffice.mimes = mimes;
                     $.each(mimes, function (ext, attr) {
diff --git a/js/settings.js b/js/settings.js
index 9e7f39d..b068590 100644
--- a/js/settings.js
+++ b/js/settings.js
@@ -64,6 +64,8 @@
                 defFormats[this.name] = this.checked;
             });
 
+            var sameTab = $("#onlyofficeSameTab").is(":checked");
+
             $.ajax({
                 method: "PUT",
                 url: OC.generateUrl("apps/onlyoffice/ajax/settings"),
@@ -72,7 +74,8 @@
                     documentserverInternal: onlyofficeInternalUrl,
                     storageUrl: onlyofficeStorageUrl,
                     secret: onlyofficeSecret,
-                    defFormats: defFormats
+                    defFormats: defFormats,
+                    sameTab: sameTab
                 },
                 success: function onSuccess(response) {
                     $(".section-onlyoffice").removeClass("icon-loading");