Merge pull request #2888 from ONLYOFFICE/fix/bugfix

Fix/bugfix
ONLYOFFICE · Mar 18, 2024 · a0ec143 · a0ec143
2 parents f5de71b + 8c8b632
commit a0ec143
Show file tree

Hide file tree

Showing 12 changed files with 46 additions and 9 deletions.
diff --git a/apps/documenteditor/embed/js/ApplicationController.js b/apps/documenteditor/embed/js/ApplicationController.js
@@ -100,7 +100,7 @@ DE.ApplicationController = new(function(){
                 if (config.customization.goback.requestClose)
                     console.log("Obsolete: The 'requestClose' parameter of the 'customization.goback' section is deprecated. Please use 'close' parameter in the 'customization' section instead.");
             }
-            if (typeof config.customization.close === 'object')
+            if (config.customization.close && typeof config.customization.close === 'object')
                 config.canCloseEditor  = (config.customization.close.visible!==false) && config.canRequestClose && !config.isDesktopApp;
         }
         config.canBackToFolder = !!_canback;

diff --git a/apps/documenteditor/forms/app/controller/ApplicationController.js b/apps/documenteditor/forms/app/controller/ApplicationController.js
@@ -473,6 +473,22 @@ define([
             this.appOptions.canPlugins      = false;
 
             Common.Controllers.Desktop.init(this.appOptions);
+
+            this.appOptions.canCloseEditor = false;
+            var _canback = false;
+            if (typeof this.appOptions.customization === 'object') {
+                if (typeof this.appOptions.customization.goback == 'object' && this.appOptions.canBackToFolder!==false) {
+                    _canback = this.appOptions.customization.close===undefined ?
+                        this.appOptions.customization.goback.url || this.appOptions.customization.goback.requestClose && this.appOptions.canRequestClose :
+                        this.appOptions.customization.goback.url && !this.appOptions.customization.goback.requestClose;
+
+                    if (this.appOptions.customization.goback.requestClose)
+                        console.log("Obsolete: The 'requestClose' parameter of the 'customization.goback' section is deprecated. Please use 'close' parameter in the 'customization' section instead.");
+                }
+                if (this.appOptions.customization.close && typeof this.appOptions.customization.close === 'object')
+                    this.appOptions.canCloseEditor  = (this.appOptions.customization.close.visible!==false) && this.appOptions.canRequestClose && !this.appOptions.isDesktopApp;
+            }
+            this.appOptions.canBackToFolder = !!_canback;
         },
 
         onExternalMessage: function(msg) {
@@ -675,6 +691,14 @@ define([
                 this.api.SetCollaborativeMarksShowType(Asc.c_oAscCollaborativeMarksShowType.None);
             }
 
+            this.view.btnClose.setVisible(this.appOptions.canCloseEditor);
+            if (this.appOptions.canCloseEditor) {
+                this.view.btnClose.updateHint(this.appOptions.customization.close.text || this.view.textClose);
+                this.view.btnClose.on('click', function(){
+                    Common.Gateway.requestClose();
+                });
+            }
+
             this.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
             this.api.asc_LoadDocument();
             this.api.Resize();

diff --git a/apps/documenteditor/forms/app/view/ApplicationView.js b/apps/documenteditor/forms/app/view/ApplicationView.js
@@ -169,6 +169,15 @@ define([
                 maskExp: /[0-9]/
             });
 
+            this.btnClose = new Common.UI.Button({
+                cls: 'btn-toolbar margin-left-small',
+                iconCls: 'svg-icon search-close',
+                hint: this.textClose,
+                visible: false,
+                scaling: false
+            });
+            this.btnClose.render($('#id-btn-close-editor'));
+
             return this;
         },
 
@@ -213,7 +222,8 @@ define([
         txtSearch: 'Search',
         tipUndo: 'Undo',
         tipRedo: 'Redo',
-        textClearField: 'Clear field'
+        textClearField: 'Clear field',
+        textClose: 'Close file'
 
     }, DE.Views.ApplicationView || {}));
 });
diff --git a/apps/documenteditor/forms/index.html b/apps/documenteditor/forms/index.html
@@ -278,6 +278,7 @@
               <div id="id-submit-group" style="display: inline-block;"></div>
               <div id="id-download-group" style="display: inline-block;"></div>
               <span id="box-tools"></span>
+              <div id="id-btn-close-editor" style="display: inline-block;"></div>
           </div>
       </div>
 

diff --git a/apps/documenteditor/forms/index.html.deploy b/apps/documenteditor/forms/index.html.deploy
@@ -259,6 +259,7 @@
               <div id="id-submit-group" style="display: inline-block;"></div>
               <div id="id-download-group" style="display: inline-block;"></div>
               <span id="box-tools"></span>
+              <div id="id-btn-close-editor" style="display: inline-block;"></div>
           </div>
       </div>
       <script>

diff --git a/apps/documenteditor/forms/locale/en.json b/apps/documenteditor/forms/locale/en.json
@@ -186,5 +186,6 @@
   "DE.Views.ApplicationView.txtPrint": "Print",
   "DE.Views.ApplicationView.txtSearch": "Search",
   "DE.Views.ApplicationView.txtShare": "Share",
-  "DE.Views.ApplicationView.txtTheme": "Interface theme"
+  "DE.Views.ApplicationView.txtTheme": "Interface theme",
+  "DE.Views.ApplicationView.textClose": "Close file"
 }
diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js
@@ -480,7 +480,7 @@ define([
                         if (this.appOptions.customization.goback.requestClose)
                             console.log("Obsolete: The 'requestClose' parameter of the 'customization.goback' section is deprecated. Please use 'close' parameter in the 'customization' section instead.");
                     }
-                    if (typeof this.appOptions.customization.close === 'object')
+                    if (this.appOptions.customization.close && typeof this.appOptions.customization.close === 'object') // if close=null - no close button
                         this.appOptions.canCloseEditor  = (this.appOptions.customization.close.visible!==false) && this.appOptions.canRequestClose && !this.appOptions.isDesktopApp;
                 }
                 this.appOptions.canBack = this.appOptions.canBackToFolder = !!_canback;

diff --git a/apps/pdfeditor/main/app/controller/Main.js b/apps/pdfeditor/main/app/controller/Main.js
@@ -417,7 +417,7 @@ define([
                         if (this.appOptions.customization.goback.requestClose)
                             console.log("Obsolete: The 'requestClose' parameter of the 'customization.goback' section is deprecated. Please use 'close' parameter in the 'customization' section instead.");
                     }
-                    if (typeof this.appOptions.customization.close === 'object')
+                    if (this.appOptions.customization.close && typeof this.appOptions.customization.close === 'object')
                         this.appOptions.canCloseEditor  = (this.appOptions.customization.close.visible!==false) && this.appOptions.canRequestClose && !this.appOptions.isDesktopApp;
                 }
                 this.appOptions.canBack = this.appOptions.canBackToFolder = !!_canback;

diff --git a/apps/presentationeditor/embed/js/ApplicationController.js b/apps/presentationeditor/embed/js/ApplicationController.js
@@ -97,7 +97,7 @@ PE.ApplicationController = new(function(){
                 if (config.customization.goback.requestClose)
                     console.log("Obsolete: The 'requestClose' parameter of the 'customization.goback' section is deprecated. Please use 'close' parameter in the 'customization' section instead.");
             }
-            if (typeof config.customization.close === 'object')
+            if (config.customization.close && typeof config.customization.close === 'object')
                 config.canCloseEditor  = (config.customization.close.visible!==false) && config.canRequestClose && !config.isDesktopApp;
         }
         config.canBackToFolder = !!_canback;

diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js
@@ -428,7 +428,7 @@ define([
                         if (this.appOptions.customization.goback.requestClose)
                             console.log("Obsolete: The 'requestClose' parameter of the 'customization.goback' section is deprecated. Please use 'close' parameter in the 'customization' section instead.");
                     }
-                    if (typeof this.appOptions.customization.close === 'object')
+                    if (this.appOptions.customization.close && typeof this.appOptions.customization.close === 'object')
                         this.appOptions.canCloseEditor  = (this.appOptions.customization.close.visible!==false) && this.appOptions.canRequestClose && !this.appOptions.isDesktopApp;
                 }
                 this.appOptions.canBack = this.appOptions.canBackToFolder = !!_canback;

diff --git a/apps/spreadsheeteditor/embed/js/ApplicationController.js b/apps/spreadsheeteditor/embed/js/ApplicationController.js
@@ -97,7 +97,7 @@ SSE.ApplicationController = new(function(){
                 if (config.customization.goback.requestClose)
                     console.log("Obsolete: The 'requestClose' parameter of the 'customization.goback' section is deprecated. Please use 'close' parameter in the 'customization' section instead.");
             }
-            if (typeof config.customization.close === 'object')
+            if (config.customization.close && typeof config.customization.close === 'object')
                 config.canCloseEditor  = (config.customization.close.visible!==false) && config.canRequestClose && !config.isDesktopApp;
         }
         config.canBackToFolder = !!_canback;

diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js
@@ -484,7 +484,7 @@ define([
                         if (this.appOptions.customization.goback.requestClose)
                             console.log("Obsolete: The 'requestClose' parameter of the 'customization.goback' section is deprecated. Please use 'close' parameter in the 'customization' section instead.");
                     }
-                    if (typeof this.appOptions.customization.close === 'object')
+                    if (this.appOptions.customization.close && typeof this.appOptions.customization.close === 'object')
                         this.appOptions.canCloseEditor  = (this.appOptions.customization.close.visible!==false) && this.appOptions.canRequestClose && !this.appOptions.isDesktopApp;
                 }
                 this.appOptions.canBack = this.appOptions.canBackToFolder = !!_canback;