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

For Bug 36883 ("goback" in current page when get critical error)

Browse source
This commit is contained in:
Julia Radzhabova 2019-01-10 16:20:27 +03:00
parent 4fc2623844
commit 654902b5d7
6 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -591,10 +591,10 @@ define([
app.getController('LeftMenu').SetDisabled(disable, true); app.getController('LeftMenu').SetDisabled(disable, true);
}, },
goBack: function() { goBack: function(current) {
if ( !Common.Controllers.Desktop.process('goback') ) { if ( !Common.Controllers.Desktop.process('goback') ) {
var href = this.appOptions.customization.goback.url; var href = this.appOptions.customization.goback.url;
if (this.appOptions.customization.goback.blank!==false) { if (!current && this.appOptions.customization.goback.blank!==false) {
window.open(href, "_blank"); window.open(href, "_blank");
} else { } else {
parent.location.href = href; parent.location.href = href;
@ -1452,7 +1452,7 @@ define([
config.msg += '<br/><br/>' + this.criticalErrorExtText; config.msg += '<br/><br/>' + this.criticalErrorExtText;
config.callback = function(btn) { config.callback = function(btn) {
if (btn == 'ok') if (btn == 'ok')
Common.NotificationCenter.trigger('goback'); Common.NotificationCenter.trigger('goback', true);
} }
} }
if (id == Asc.c_oAscError.ID.DataEncrypted) { if (id == Asc.c_oAscError.ID.DataEncrypted) {

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

@ -316,9 +316,9 @@ define([
} }
}, },
goBack: function() { goBack: function(current) {
var href = this.appOptions.customization.goback.url; var href = this.appOptions.customization.goback.url;
if (this.appOptions.customization.goback.blank!==false) { if (!current && this.appOptions.customization.goback.blank!==false) {
window.open(href, "_blank"); window.open(href, "_blank");
} else { } else {
parent.location.href = href; parent.location.href = href;
@ -906,7 +906,7 @@ define([
if (this.appOptions.canBackToFolder && !this.appOptions.isDesktopApp) { if (this.appOptions.canBackToFolder && !this.appOptions.isDesktopApp) {
config.msg += '</br></br>' + this.criticalErrorExtText; config.msg += '</br></br>' + this.criticalErrorExtText;
config.callback = function() { config.callback = function() {
Common.NotificationCenter.trigger('goback'); Common.NotificationCenter.trigger('goback', true);
} }
} }
if (id == Asc.c_oAscError.ID.DataEncrypted) { if (id == Asc.c_oAscError.ID.DataEncrypted) {

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

@ -407,11 +407,11 @@ define([
} }
}, },
goBack: function() { goBack: function(current) {
var me = this; var me = this;
if ( !Common.Controllers.Desktop.process('goback') ) { if ( !Common.Controllers.Desktop.process('goback') ) {
var href = me.appOptions.customization.goback.url; var href = me.appOptions.customization.goback.url;
if (me.appOptions.customization.goback.blank!==false) { if (!current && me.appOptions.customization.goback.blank!==false) {
window.open(href, "_blank"); window.open(href, "_blank");
} else { } else {
parent.location.href = href; parent.location.href = href;
@ -1185,9 +1185,9 @@ define([
if (this.appOptions.canBackToFolder && !this.appOptions.isDesktopApp && typeof id !== 'string') { if (this.appOptions.canBackToFolder && !this.appOptions.isDesktopApp && typeof id !== 'string') {
config.msg += '<br/><br/>' + this.criticalErrorExtText; config.msg += '<br/><br/>' + this.criticalErrorExtText;
config.fn = function(btn) { config.callback = function(btn) {
if (btn == 'ok') { if (btn == 'ok') {
Common.NotificationCenter.trigger('goback'); Common.NotificationCenter.trigger('goback', true);
} }
} }
} }

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

@ -306,9 +306,9 @@ define([
this.api.asc_DownloadAs(Asc.c_oAscFileType.PPTX, true); this.api.asc_DownloadAs(Asc.c_oAscFileType.PPTX, true);
}, },
goBack: function() { goBack: function(current) {
var href = this.appOptions.customization.goback.url; var href = this.appOptions.customization.goback.url;
if (this.appOptions.customization.goback.blank!==false) { if (!current && this.appOptions.customization.goback.blank!==false) {
window.open(href, "_blank"); window.open(href, "_blank");
} else { } else {
parent.location.href = href; parent.location.href = href;
@ -856,7 +856,7 @@ define([
if (this.appOptions.canBackToFolder && !this.appOptions.isDesktopApp) { if (this.appOptions.canBackToFolder && !this.appOptions.isDesktopApp) {
config.msg += '</br></br>' + this.criticalErrorExtText; config.msg += '</br></br>' + this.criticalErrorExtText;
config.callback = function() { config.callback = function() {
Common.NotificationCenter.trigger('goback'); Common.NotificationCenter.trigger('goback', true);
} }
} }
if (id == Asc.c_oAscError.ID.DataEncrypted) { if (id == Asc.c_oAscError.ID.DataEncrypted) {

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

@ -434,11 +434,11 @@ define([
} }
}, },
goBack: function() { goBack: function(current) {
var me = this; var me = this;
if ( !Common.Controllers.Desktop.process('goback') ) { if ( !Common.Controllers.Desktop.process('goback') ) {
var href = me.appOptions.customization.goback.url; var href = me.appOptions.customization.goback.url;
if (me.appOptions.customization.goback.blank!==false) { if (!current && me.appOptions.customization.goback.blank!==false) {
window.open(href, "_blank"); window.open(href, "_blank");
} else { } else {
parent.location.href = href; parent.location.href = href;
@ -1350,7 +1350,7 @@ define([
config.msg += '<br/><br/>' + this.criticalErrorExtText; config.msg += '<br/><br/>' + this.criticalErrorExtText;
config.callback = function(btn) { config.callback = function(btn) {
if (btn == 'ok') { if (btn == 'ok') {
Common.NotificationCenter.trigger('goback'); Common.NotificationCenter.trigger('goback', true);
} }
} }
} }

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

@ -309,9 +309,9 @@ define([
this.api.asc_DownloadAs(Asc.c_oAscFileType.XLSX, true); this.api.asc_DownloadAs(Asc.c_oAscFileType.XLSX, true);
}, },
goBack: function() { goBack: function(current) {
var href = this.appOptions.customization.goback.url; var href = this.appOptions.customization.goback.url;
if (this.appOptions.customization.goback.blank!==false) { if (!current && this.appOptions.customization.goback.blank!==false) {
window.open(href, "_blank"); window.open(href, "_blank");
} else { } else {
parent.location.href = href; parent.location.href = href;
@ -990,7 +990,7 @@ define([
if (this.appOptions.canBackToFolder && !this.appOptions.isDesktopApp) { if (this.appOptions.canBackToFolder && !this.appOptions.isDesktopApp) {
config.msg += '</br></br>' + this.criticalErrorExtText; config.msg += '</br></br>' + this.criticalErrorExtText;
config.callback = function() { config.callback = function() {
Common.NotificationCenter.trigger('goback'); Common.NotificationCenter.trigger('goback', true);
} }
} }
if (id == Asc.c_oAscError.ID.DataEncrypted) { if (id == Asc.c_oAscError.ID.DataEncrypted) {