Skip to content

Commit

Permalink
Merge pull request #2861 from ONLYOFFICE/fix/bugfix
Browse files Browse the repository at this point in the history 
Change customization.close parameter: visible=true by default
  • Loading branch information
@JuliaRadzhabova
JuliaRadzhabova authored Feb 27, 2024
2 parents 3187711 + 8c85a78 commit 186e3b7
Show file tree
Hide file tree
Showing 11 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion apps/api/documents/api.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
2 changes: 1 addition & 1 deletion apps/documenteditor/embed/js/ApplicationController.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion apps/documenteditor/main/app/controller/Main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion apps/documenteditor/mobile/src/store/appOptions.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}

Expand Down
2 changes: 1 addition & 1 deletion apps/pdfeditor/main/app/controller/Main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion apps/presentationeditor/embed/js/ApplicationController.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion apps/presentationeditor/main/app/controller/Main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion apps/presentationeditor/mobile/src/store/appOptions.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}

Expand Down
2 changes: 1 addition & 1 deletion apps/spreadsheeteditor/embed/js/ApplicationController.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion apps/spreadsheeteditor/main/app/controller/Main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion apps/spreadsheeteditor/mobile/src/store/appOptions.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}

Expand Down

0 comments on commit 186e3b7

Please sign in to comment.