From 33c8dcf475042f56d140ad3b952eba563e8e80bd Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 7 Feb 2018 12:21:10 +0300 Subject: [PATCH] Don't use customization.goback.url on critical errors in desktop. --- apps/documenteditor/main/app/controller/Main.js | 2 +- apps/documenteditor/mobile/app/controller/Main.js | 2 +- apps/presentationeditor/main/app/controller/Main.js | 2 +- apps/presentationeditor/mobile/app/controller/Main.js | 2 +- apps/spreadsheeteditor/main/app/controller/Main.js | 2 +- apps/spreadsheeteditor/mobile/app/controller/Main.js | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 32ad346c4..016bcd07b 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -1395,7 +1395,7 @@ define([ config.title = this.criticalErrorTitle; config.iconCls = 'error'; - if (this.appOptions.canBackToFolder) { + if (this.appOptions.canBackToFolder && !this.appOptions.isDesktopApp) { config.msg += '

' + this.criticalErrorExtText; config.callback = function(btn) { if (btn == 'ok') diff --git a/apps/documenteditor/mobile/app/controller/Main.js b/apps/documenteditor/mobile/app/controller/Main.js index 3d0cedd5f..9aa96b4ce 100644 --- a/apps/documenteditor/mobile/app/controller/Main.js +++ b/apps/documenteditor/mobile/app/controller/Main.js @@ -867,7 +867,7 @@ define([ config.title = this.criticalErrorTitle; // config.iconCls = 'error'; - if (this.appOptions.canBackToFolder) { + if (this.appOptions.canBackToFolder && !this.appOptions.isDesktopApp) { config.msg += '

' + this.criticalErrorExtText; config.callback = function() { Common.NotificationCenter.trigger('goback'); diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index db1f9fb2e..297f1049e 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -1134,7 +1134,7 @@ define([ config.title = this.criticalErrorTitle; config.iconCls = 'error'; - if (this.appOptions.canBackToFolder) { + if (this.appOptions.canBackToFolder && !this.appOptions.isDesktopApp) { config.msg += '

' + this.criticalErrorExtText; config.fn = function(btn) { if (btn == 'ok') { diff --git a/apps/presentationeditor/mobile/app/controller/Main.js b/apps/presentationeditor/mobile/app/controller/Main.js index e629e88f1..975cfe0a1 100644 --- a/apps/presentationeditor/mobile/app/controller/Main.js +++ b/apps/presentationeditor/mobile/app/controller/Main.js @@ -820,7 +820,7 @@ define([ config.title = this.criticalErrorTitle; // config.iconCls = 'error'; - if (this.appOptions.canBackToFolder) { + if (this.appOptions.canBackToFolder && !this.appOptions.isDesktopApp) { config.msg += '

' + this.criticalErrorExtText; config.callback = function() { Common.NotificationCenter.trigger('goback'); diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 73e650de3..6945654ce 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -1298,7 +1298,7 @@ define([ config.title = this.criticalErrorTitle; config.iconCls = 'error'; - if (this.appOptions.canBackToFolder) { + if (this.appOptions.canBackToFolder && !this.appOptions.isDesktopApp) { config.msg += '

' + this.criticalErrorExtText; config.callback = function(btn) { if (btn == 'ok') { diff --git a/apps/spreadsheeteditor/mobile/app/controller/Main.js b/apps/spreadsheeteditor/mobile/app/controller/Main.js index 98ce0a370..5fc9acdb7 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/Main.js +++ b/apps/spreadsheeteditor/mobile/app/controller/Main.js @@ -960,7 +960,7 @@ define([ config.title = this.criticalErrorTitle; // config.iconCls = 'error'; - if (this.appOptions.canBackToFolder) { + if (this.appOptions.canBackToFolder && !this.appOptions.isDesktopApp) { config.msg += '

' + this.criticalErrorExtText; config.callback = function() { Common.NotificationCenter.trigger('goback');