Fix Bug 36883.
This commit is contained in:
parent
42949a67aa
commit
f3c3ead61c
|
@ -104,7 +104,8 @@
|
||||||
},
|
},
|
||||||
goback: {
|
goback: {
|
||||||
url: 'http://...',
|
url: 'http://...',
|
||||||
text: 'Go to London'
|
text: 'Go to London',
|
||||||
|
blank: true
|
||||||
},
|
},
|
||||||
chat: true,
|
chat: true,
|
||||||
comments: true,
|
comments: true,
|
||||||
|
|
|
@ -211,7 +211,7 @@ define([
|
||||||
if ( !(me.branding && me.branding.goback && me.branding.goback.text) )
|
if ( !(me.branding && me.branding.goback && me.branding.goback.text) )
|
||||||
me.btnGoBack.updateHint(me.textBack);
|
me.btnGoBack.updateHint(me.textBack);
|
||||||
me.btnGoBack.on('click', function (e) {
|
me.btnGoBack.on('click', function (e) {
|
||||||
Common.NotificationCenter.trigger('goback', true);
|
Common.NotificationCenter.trigger('goback');
|
||||||
});
|
});
|
||||||
|
|
||||||
if ( me.logo )
|
if ( me.logo )
|
||||||
|
|
|
@ -580,9 +580,9 @@ define([
|
||||||
app.getController('LeftMenu').SetDisabled(disable, true);
|
app.getController('LeftMenu').SetDisabled(disable, true);
|
||||||
},
|
},
|
||||||
|
|
||||||
goBack: function(blank) {
|
goBack: function() {
|
||||||
var href = this.appOptions.customization.goback.url;
|
var href = this.appOptions.customization.goback.url;
|
||||||
if (blank) {
|
if (this.appOptions.customization.goback.blank!==false) {
|
||||||
window.open(href, "_blank");
|
window.open(href, "_blank");
|
||||||
} else {
|
} else {
|
||||||
parent.location.href = href;
|
parent.location.href = href;
|
||||||
|
|
|
@ -301,9 +301,9 @@ define([
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
goBack: function(blank) {
|
goBack: function() {
|
||||||
var href = this.appOptions.customization.goback.url;
|
var href = this.appOptions.customization.goback.url;
|
||||||
if (blank) {
|
if (this.appOptions.customization.goback.blank!==false) {
|
||||||
window.open(href, "_blank");
|
window.open(href, "_blank");
|
||||||
} else {
|
} else {
|
||||||
parent.location.href = href;
|
parent.location.href = href;
|
||||||
|
|
|
@ -391,9 +391,9 @@ define([
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
goBack: function(blank) {
|
goBack: function() {
|
||||||
var href = this.appOptions.customization.goback.url;
|
var href = this.appOptions.customization.goback.url;
|
||||||
if (blank) {
|
if (this.appOptions.customization.goback.blank!==false) {
|
||||||
window.open(href, "_blank");
|
window.open(href, "_blank");
|
||||||
} else {
|
} else {
|
||||||
parent.location.href = href;
|
parent.location.href = href;
|
||||||
|
|
|
@ -294,9 +294,9 @@ define([
|
||||||
this.api.asc_DownloadAs(Asc.c_oAscFileType.PPTX, true);
|
this.api.asc_DownloadAs(Asc.c_oAscFileType.PPTX, true);
|
||||||
},
|
},
|
||||||
|
|
||||||
goBack: function(blank) {
|
goBack: function() {
|
||||||
var href = this.appOptions.customization.goback.url;
|
var href = this.appOptions.customization.goback.url;
|
||||||
if (blank) {
|
if (this.appOptions.customization.goback.blank!==false) {
|
||||||
window.open(href, "_blank");
|
window.open(href, "_blank");
|
||||||
} else {
|
} else {
|
||||||
parent.location.href = href;
|
parent.location.href = href;
|
||||||
|
|
|
@ -426,9 +426,9 @@ define([
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
goBack: function(blank) {
|
goBack: function() {
|
||||||
var href = this.appOptions.customization.goback.url;
|
var href = this.appOptions.customization.goback.url;
|
||||||
if (blank) {
|
if (this.appOptions.customization.goback.blank!==false) {
|
||||||
window.open(href, "_blank");
|
window.open(href, "_blank");
|
||||||
} else {
|
} else {
|
||||||
parent.location.href = href;
|
parent.location.href = href;
|
||||||
|
|
|
@ -296,9 +296,9 @@ define([
|
||||||
this.api.asc_DownloadAs(Asc.c_oAscFileType.XLSX, true);
|
this.api.asc_DownloadAs(Asc.c_oAscFileType.XLSX, true);
|
||||||
},
|
},
|
||||||
|
|
||||||
goBack: function(blank) {
|
goBack: function() {
|
||||||
var href = this.appOptions.customization.goback.url;
|
var href = this.appOptions.customization.goback.url;
|
||||||
if (blank) {
|
if (this.appOptions.customization.goback.blank!==false) {
|
||||||
window.open(href, "_blank");
|
window.open(href, "_blank");
|
||||||
} else {
|
} else {
|
||||||
parent.location.href = href;
|
parent.location.href = href;
|
||||||
|
|
Loading…
Reference in a new issue