Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix Bug 36883.

Browse source
This commit is contained in:
Julia Radzhabova 2018-02-14 17:11:28 +03:00
parent 42949a67aa
commit f3c3ead61c
8 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/api/documents/api.js
View file

@ -104,7 +104,8 @@
},
goback: {
url: 'http://...',
text: 'Go to London'
text: 'Go to London',
blank: true
},
chat: true,
comments: true,

2
apps/common/main/lib/view/Header.js
View file

@ -211,7 +211,7 @@ define([
if ( !(me.branding && me.branding.goback && me.branding.goback.text) )
me.btnGoBack.updateHint(me.textBack);
me.btnGoBack.on('click', function (e) {
Common.NotificationCenter.trigger('goback', true);
Common.NotificationCenter.trigger('goback');
});
if ( me.logo )

4
apps/documenteditor/main/app/controller/Main.js
View file

@ -580,9 +580,9 @@ define([
app.getController('LeftMenu').SetDisabled(disable, true);
},
goBack: function(blank) {
goBack: function() {
var href = this.appOptions.customization.goback.url;
if (blank) {
if (this.appOptions.customization.goback.blank!==false) {
window.open(href, "_blank");
} else {
parent.location.href = href;

4
apps/documenteditor/mobile/app/controller/Main.js
View file

@ -301,9 +301,9 @@ define([
}
},
goBack: function(blank) {
goBack: function() {
var href = this.appOptions.customization.goback.url;
if (blank) {
if (this.appOptions.customization.goback.blank!==false) {
window.open(href, "_blank");
} else {
parent.location.href = href;

4
apps/presentationeditor/main/app/controller/Main.js
View file

@ -391,9 +391,9 @@ define([
}
},
goBack: function(blank) {
goBack: function() {
var href = this.appOptions.customization.goback.url;
if (blank) {
if (this.appOptions.customization.goback.blank!==false) {
window.open(href, "_blank");
} else {
parent.location.href = href;

4
apps/presentationeditor/mobile/app/controller/Main.js
View file

@ -294,9 +294,9 @@ define([
this.api.asc_DownloadAs(Asc.c_oAscFileType.PPTX, true);
},
goBack: function(blank) {
goBack: function() {
var href = this.appOptions.customization.goback.url;
if (blank) {
if (this.appOptions.customization.goback.blank!==false) {
window.open(href, "_blank");
} else {
parent.location.href = href;

4
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -426,9 +426,9 @@ define([
}
},
goBack: function(blank) {
goBack: function() {
var href = this.appOptions.customization.goback.url;
if (blank) {
if (this.appOptions.customization.goback.blank!==false) {
window.open(href, "_blank");
} else {
parent.location.href = href;

4
apps/spreadsheeteditor/mobile/app/controller/Main.js
View file

@ -296,9 +296,9 @@ define([
this.api.asc_DownloadAs(Asc.c_oAscFileType.XLSX, true);
},
goBack: function(blank) {
goBack: function() {
var href = this.appOptions.customization.goback.url;
if (blank) {
if (this.appOptions.customization.goback.blank!==false) {
window.open(href, "_blank");
} else {
parent.location.href = href;