Merge pull request #2861 from ONLYOFFICE/fix/bugfix

Change customization.close parameter: visible=true by default
ONLYOFFICE · Feb 27, 2024 · 186e3b7 · 186e3b7
2 parents 3187711 + 8c85a78
commit 186e3b7
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 11 deletions.
diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js
@@ -135,7 +135,7 @@
                         requestClose: false // if true - goback send onRequestClose event instead opening url, deprecated, use customization.close instead
                     },
                     close: {
-                        visible: false,
+                        visible: true,
                         text: 'Close file'
                     },
                     reviewPermissions: {

diff --git a/apps/documenteditor/embed/js/ApplicationController.js b/apps/documenteditor/embed/js/ApplicationController.js
@@ -101,7 +101,7 @@ DE.ApplicationController = new(function(){
                     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')
-                config.canCloseEditor  = !!config.customization.close.visible && config.canRequestClose && !config.isDesktopApp;
+                config.canCloseEditor  = (config.customization.close.visible!==false) && config.canRequestClose && !config.isDesktopApp;
         }
         config.canBackToFolder = !!_canback;
     }

diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js
@@ -479,7 +479,7 @@ define([
                             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')
-                        this.appOptions.canCloseEditor  = !!this.appOptions.customization.close.visible && this.appOptions.canRequestClose && !this.appOptions.isDesktopApp;
+                        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/documenteditor/mobile/src/store/appOptions.js b/apps/documenteditor/mobile/src/store/appOptions.js
@@ -147,7 +147,7 @@ export class storeAppOptions {
             }
 
             if (typeof close === 'object' && close !== null) {
-                this.canCloseEditor = !!close.visible && this.canRequestClose && !this.isDesktopApp;
+                this.canCloseEditor = (close.visible!==false) && this.canRequestClose && !this.isDesktopApp;
             }
         }
 

diff --git a/apps/pdfeditor/main/app/controller/Main.js b/apps/pdfeditor/main/app/controller/Main.js
@@ -418,7 +418,7 @@ define([
                             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')
-                        this.appOptions.canCloseEditor  = !!this.appOptions.customization.close.visible && this.appOptions.canRequestClose && !this.appOptions.isDesktopApp;
+                        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
@@ -98,7 +98,7 @@ PE.ApplicationController = new(function(){
                     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')
-                config.canCloseEditor  = !!config.customization.close.visible && config.canRequestClose && !config.isDesktopApp;
+                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
@@ -426,7 +426,7 @@ define([
                             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')
-                        this.appOptions.canCloseEditor  = !!this.appOptions.customization.close.visible && this.appOptions.canRequestClose && !this.appOptions.isDesktopApp;
+                        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/mobile/src/store/appOptions.js b/apps/presentationeditor/mobile/src/store/appOptions.js
@@ -81,7 +81,7 @@ export class storeAppOptions {
             }
 
             if (typeof close === 'object' && close !== null) {
-                this.canCloseEditor = !!close.visible && this.canRequestClose && !this.isDesktopApp;
+                this.canCloseEditor = (close.visible!==false) && this.canRequestClose && !this.isDesktopApp;
             }
         }
 

diff --git a/apps/spreadsheeteditor/embed/js/ApplicationController.js b/apps/spreadsheeteditor/embed/js/ApplicationController.js
@@ -98,7 +98,7 @@ SSE.ApplicationController = new(function(){
                     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')
-                config.canCloseEditor  = !!config.customization.close.visible && config.canRequestClose && !config.isDesktopApp;
+                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([
                             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')
-                        this.appOptions.canCloseEditor  = !!this.appOptions.customization.close.visible && this.appOptions.canRequestClose && !this.appOptions.isDesktopApp;
+                        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/mobile/src/store/appOptions.js b/apps/spreadsheeteditor/mobile/src/store/appOptions.js
@@ -90,7 +90,7 @@ export class storeAppOptions {
             }
 
             if (typeof close === 'object' && close !== null) {
-                this.canCloseEditor = !!close.visible && this.canRequestClose && !this.isDesktopApp;
+                this.canCloseEditor = (close.visible!==false) && this.canRequestClose && !this.isDesktopApp;
             }
         }