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

Show critical error with custom message.

Browse source
This commit is contained in:
Julia Radzhabova 2018-03-01 17:37:15 +03:00
parent c74517cfae
commit d04a61933e
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1376,11 +1376,10 @@ define([
break; break;
default: default:
config.msg = this.errorDefaultMessage.replace('%1', id); config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id);
break; break;
} }
if (level == Asc.c_oAscError.Level.Critical) { if (level == Asc.c_oAscError.Level.Critical) {
// report only critical errors // report only critical errors
@ -1389,7 +1388,7 @@ define([
config.title = this.criticalErrorTitle; config.title = this.criticalErrorTitle;
config.iconCls = 'error'; config.iconCls = 'error';
if (this.appOptions.canBackToFolder && !this.appOptions.isDesktopApp) { if (this.appOptions.canBackToFolder && !this.appOptions.isDesktopApp && typeof id !== 'string') {
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')

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

@ -1116,7 +1116,7 @@ define([
break; break;
default: default:
config.msg = this.errorDefaultMessage.replace('%1', id); config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id);
break; break;
} }
@ -1129,7 +1129,7 @@ define([
config.title = this.criticalErrorTitle; config.title = this.criticalErrorTitle;
config.iconCls = 'error'; config.iconCls = 'error';
if (this.appOptions.canBackToFolder && !this.appOptions.isDesktopApp) { 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.fn = function(btn) {
if (btn == 'ok') { if (btn == 'ok') {

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

@ -1285,7 +1285,7 @@ define([
break; break;
default: default:
config.msg = this.errorDefaultMessage.replace('%1', id); config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id);
break; break;
} }
@ -1296,7 +1296,7 @@ define([
config.title = this.criticalErrorTitle; config.title = this.criticalErrorTitle;
config.iconCls = 'error'; config.iconCls = 'error';
if (this.appOptions.canBackToFolder && !this.appOptions.isDesktopApp) { if (this.appOptions.canBackToFolder && !this.appOptions.isDesktopApp && typeof id !== 'string') {
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') {