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

Fix Bug 37355

Browse source
This commit is contained in:
Julia Radzhabova 2018-05-03 18:27:05 +03:00
parent 43de4621f1
commit 4aa68f5eb5
6 changed files with 9 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/common/main/lib/controller/History.js
View file

@ -159,7 +159,6 @@ define([
onSetHistoryData: function(opts) { onSetHistoryData: function(opts) {
if (opts.data.error) { if (opts.data.error) {
var config = { var config = {
closable: false,
title: this.notcriticalErrorTitle, title: this.notcriticalErrorTitle,
msg: opts.data.error, msg: opts.data.error,
iconCls: 'warn', iconCls: 'warn',

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

@ -444,7 +444,6 @@ define([
}); });
} }
Common.UI.alert({ Common.UI.alert({
closable: false,
title: this.notcriticalErrorTitle, title: this.notcriticalErrorTitle,
msg: (opts.data.error) ? opts.data.error : this.txtErrorLoadHistory, msg: (opts.data.error) ? opts.data.error : this.txtErrorLoadHistory,
iconCls: 'warn', iconCls: 'warn',
@ -1252,7 +1251,7 @@ define([
this.onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); this.onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
var config = { var config = {
closable: false closable: true
}; };
switch (id) switch (id)
@ -1352,6 +1351,7 @@ define([
case Asc.c_oAscError.ID.Warning: case Asc.c_oAscError.ID.Warning:
config.msg = this.errorConnectToServer; config.msg = this.errorConnectToServer;
config.closable = false;
break; break;
case Asc.c_oAscError.ID.SessionAbsolute: case Asc.c_oAscError.ID.SessionAbsolute:
@ -1395,6 +1395,7 @@ define([
config.title = this.criticalErrorTitle; config.title = this.criticalErrorTitle;
config.iconCls = 'error'; config.iconCls = 'error';
config.closable = false;
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;

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

@ -1004,7 +1004,7 @@ define([
this.onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); this.onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
var config = { var config = {
closable: false closable: true
}; };
switch (id) switch (id)
@ -1096,6 +1096,7 @@ define([
case Asc.c_oAscError.ID.Warning: case Asc.c_oAscError.ID.Warning:
config.msg = this.errorConnectToServer; config.msg = this.errorConnectToServer;
config.closable = false;
break; break;
case Asc.c_oAscError.ID.SessionAbsolute: case Asc.c_oAscError.ID.SessionAbsolute:
@ -1140,6 +1141,7 @@ define([
config.title = this.criticalErrorTitle; config.title = this.criticalErrorTitle;
config.iconCls = 'error'; config.iconCls = 'error';
config.closable = false;
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;

1
apps/spreadsheeteditor/main/app/controller/LeftMenu.js
View file

@ -251,7 +251,6 @@ define([
clickSaveAsFormat: function(menu, format) { clickSaveAsFormat: function(menu, format) {
if (format == Asc.c_oAscFileType.CSV) { if (format == Asc.c_oAscFileType.CSV) {
Common.UI.warning({ Common.UI.warning({
closable: false,
title: this.textWarning, title: this.textWarning,
msg: this.warnDownloadAs, msg: this.warnDownloadAs,
buttons: ['ok', 'cancel'], buttons: ['ok', 'cancel'],

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

@ -1059,7 +1059,7 @@ define([
this.hidePreloader(); this.hidePreloader();
this.onLongActionEnd(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument); this.onLongActionEnd(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument);
var config = {closable: false}; var config = {closable: true};
switch (id) { switch (id) {
case Asc.c_oAscError.ID.Unknown: case Asc.c_oAscError.ID.Unknown:
@ -1100,47 +1100,38 @@ define([
case Asc.c_oAscError.ID.FrmlWrongCountParentheses: case Asc.c_oAscError.ID.FrmlWrongCountParentheses:
config.msg = this.errorWrongBracketsCount; config.msg = this.errorWrongBracketsCount;
config.closable = true;
break; break;
case Asc.c_oAscError.ID.FrmlWrongOperator: case Asc.c_oAscError.ID.FrmlWrongOperator:
config.msg = this.errorWrongOperator; config.msg = this.errorWrongOperator;
config.closable = true;
break; break;
case Asc.c_oAscError.ID.FrmlWrongMaxArgument: case Asc.c_oAscError.ID.FrmlWrongMaxArgument:
config.msg = this.errorCountArgExceed; config.msg = this.errorCountArgExceed;
config.closable = true;
break; break;
case Asc.c_oAscError.ID.FrmlWrongCountArgument: case Asc.c_oAscError.ID.FrmlWrongCountArgument:
config.msg = this.errorCountArg; config.msg = this.errorCountArg;
config.closable = true;
break; break;
case Asc.c_oAscError.ID.FrmlWrongFunctionName: case Asc.c_oAscError.ID.FrmlWrongFunctionName:
config.msg = this.errorFormulaName; config.msg = this.errorFormulaName;
config.closable = true;
break; break;
case Asc.c_oAscError.ID.FrmlAnotherParsingError: case Asc.c_oAscError.ID.FrmlAnotherParsingError:
config.msg = this.errorFormulaParsing; config.msg = this.errorFormulaParsing;
config.closable = true;
break; break;
case Asc.c_oAscError.ID.FrmlWrongArgumentRange: case Asc.c_oAscError.ID.FrmlWrongArgumentRange:
config.msg = this.errorArgsRange; config.msg = this.errorArgsRange;
config.closable = true;
break; break;
case Asc.c_oAscError.ID.FrmlOperandExpected: case Asc.c_oAscError.ID.FrmlOperandExpected:
config.msg = this.errorOperandExpected; config.msg = this.errorOperandExpected;
config.closable = true;
break; break;
case Asc.c_oAscError.ID.FrmlWrongReferences: case Asc.c_oAscError.ID.FrmlWrongReferences:
config.msg = this.errorFrmlWrongReferences; config.msg = this.errorFrmlWrongReferences;
config.closable = true;
break; break;
case Asc.c_oAscError.ID.UnexpectedGuid: case Asc.c_oAscError.ID.UnexpectedGuid:
@ -1246,6 +1237,7 @@ define([
case Asc.c_oAscError.ID.Warning: case Asc.c_oAscError.ID.Warning:
config.msg = this.errorConnectToServer; config.msg = this.errorConnectToServer;
config.closable = false;
break; break;
case Asc.c_oAscError.ID.LockedWorksheetRename: case Asc.c_oAscError.ID.LockedWorksheetRename:
@ -1304,6 +1296,7 @@ define([
config.title = this.criticalErrorTitle; config.title = this.criticalErrorTitle;
config.iconCls = 'error'; config.iconCls = 'error';
config.closable = false;
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;
@ -1822,7 +1815,6 @@ define([
onNamedRangeLocked: function() { onNamedRangeLocked: function() {
if ($('.asc-window.modal.alert:visible').length < 1) { if ($('.asc-window.modal.alert:visible').length < 1) {
Common.UI.alert({ Common.UI.alert({
closable: false,
msg: this.errorCreateDefName, msg: this.errorCreateDefName,
title: this.notcriticalErrorTitle, title: this.notcriticalErrorTitle,
iconCls: 'warn', iconCls: 'warn',

1
apps/spreadsheeteditor/main/app/view/NamedRangeEditDlg.js
View file

@ -271,7 +271,6 @@ define([
if (state == 'ok') { if (state == 'ok') {
if (this.locked) { if (this.locked) {
Common.UI.alert({ Common.UI.alert({
closable: false,
msg: this.errorCreateDefName, msg: this.errorCreateDefName,
title: this.notcriticalErrorTitle, title: this.notcriticalErrorTitle,
iconCls: 'warn', iconCls: 'warn',