diff --git a/apps/common/main/lib/controller/History.js b/apps/common/main/lib/controller/History.js
index 998bbdecd..3d68ca4b4 100644
--- a/apps/common/main/lib/controller/History.js
+++ b/apps/common/main/lib/controller/History.js
@@ -159,7 +159,6 @@ define([
onSetHistoryData: function(opts) {
if (opts.data.error) {
var config = {
- closable: false,
title: this.notcriticalErrorTitle,
msg: opts.data.error,
iconCls: 'warn',
diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js
index d6becf0b2..04361cb91 100644
--- a/apps/documenteditor/main/app/controller/Main.js
+++ b/apps/documenteditor/main/app/controller/Main.js
@@ -444,7 +444,6 @@ define([
});
}
Common.UI.alert({
- closable: false,
title: this.notcriticalErrorTitle,
msg: (opts.data.error) ? opts.data.error : this.txtErrorLoadHistory,
iconCls: 'warn',
@@ -1252,7 +1251,7 @@ define([
this.onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
var config = {
- closable: false
+ closable: true
};
switch (id)
@@ -1352,6 +1351,7 @@ define([
case Asc.c_oAscError.ID.Warning:
config.msg = this.errorConnectToServer;
+ config.closable = false;
break;
case Asc.c_oAscError.ID.SessionAbsolute:
@@ -1395,6 +1395,7 @@ define([
config.title = this.criticalErrorTitle;
config.iconCls = 'error';
+ config.closable = false;
if (this.appOptions.canBackToFolder && !this.appOptions.isDesktopApp && typeof id !== 'string') {
config.msg += '
' + this.criticalErrorExtText;
diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js
index 8baae7e8a..48acef448 100644
--- a/apps/presentationeditor/main/app/controller/Main.js
+++ b/apps/presentationeditor/main/app/controller/Main.js
@@ -1004,7 +1004,7 @@ define([
this.onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
var config = {
- closable: false
+ closable: true
};
switch (id)
@@ -1096,6 +1096,7 @@ define([
case Asc.c_oAscError.ID.Warning:
config.msg = this.errorConnectToServer;
+ config.closable = false;
break;
case Asc.c_oAscError.ID.SessionAbsolute:
@@ -1140,6 +1141,7 @@ define([
config.title = this.criticalErrorTitle;
config.iconCls = 'error';
+ config.closable = false;
if (this.appOptions.canBackToFolder && !this.appOptions.isDesktopApp && typeof id !== 'string') {
config.msg += '
' + this.criticalErrorExtText;
diff --git a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js
index 8694f3e1a..e3fe4c915 100644
--- a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js
+++ b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js
@@ -251,7 +251,6 @@ define([
clickSaveAsFormat: function(menu, format) {
if (format == Asc.c_oAscFileType.CSV) {
Common.UI.warning({
- closable: false,
title: this.textWarning,
msg: this.warnDownloadAs,
buttons: ['ok', 'cancel'],
diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js
index a11dc44fb..4813fe46a 100644
--- a/apps/spreadsheeteditor/main/app/controller/Main.js
+++ b/apps/spreadsheeteditor/main/app/controller/Main.js
@@ -1059,7 +1059,7 @@ define([
this.hidePreloader();
this.onLongActionEnd(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument);
- var config = {closable: false};
+ var config = {closable: true};
switch (id) {
case Asc.c_oAscError.ID.Unknown:
@@ -1100,47 +1100,38 @@ define([
case Asc.c_oAscError.ID.FrmlWrongCountParentheses:
config.msg = this.errorWrongBracketsCount;
- config.closable = true;
break;
case Asc.c_oAscError.ID.FrmlWrongOperator:
config.msg = this.errorWrongOperator;
- config.closable = true;
break;
case Asc.c_oAscError.ID.FrmlWrongMaxArgument:
config.msg = this.errorCountArgExceed;
- config.closable = true;
break;
case Asc.c_oAscError.ID.FrmlWrongCountArgument:
config.msg = this.errorCountArg;
- config.closable = true;
break;
case Asc.c_oAscError.ID.FrmlWrongFunctionName:
config.msg = this.errorFormulaName;
- config.closable = true;
break;
case Asc.c_oAscError.ID.FrmlAnotherParsingError:
config.msg = this.errorFormulaParsing;
- config.closable = true;
break;
case Asc.c_oAscError.ID.FrmlWrongArgumentRange:
config.msg = this.errorArgsRange;
- config.closable = true;
break;
case Asc.c_oAscError.ID.FrmlOperandExpected:
config.msg = this.errorOperandExpected;
- config.closable = true;
break;
case Asc.c_oAscError.ID.FrmlWrongReferences:
config.msg = this.errorFrmlWrongReferences;
- config.closable = true;
break;
case Asc.c_oAscError.ID.UnexpectedGuid:
@@ -1246,6 +1237,7 @@ define([
case Asc.c_oAscError.ID.Warning:
config.msg = this.errorConnectToServer;
+ config.closable = false;
break;
case Asc.c_oAscError.ID.LockedWorksheetRename:
@@ -1304,6 +1296,7 @@ define([
config.title = this.criticalErrorTitle;
config.iconCls = 'error';
+ config.closable = false;
if (this.appOptions.canBackToFolder && !this.appOptions.isDesktopApp && typeof id !== 'string') {
config.msg += '
' + this.criticalErrorExtText;
@@ -1822,7 +1815,6 @@ define([
onNamedRangeLocked: function() {
if ($('.asc-window.modal.alert:visible').length < 1) {
Common.UI.alert({
- closable: false,
msg: this.errorCreateDefName,
title: this.notcriticalErrorTitle,
iconCls: 'warn',
diff --git a/apps/spreadsheeteditor/main/app/view/NamedRangeEditDlg.js b/apps/spreadsheeteditor/main/app/view/NamedRangeEditDlg.js
index b219f2497..5fe5fef46 100644
--- a/apps/spreadsheeteditor/main/app/view/NamedRangeEditDlg.js
+++ b/apps/spreadsheeteditor/main/app/view/NamedRangeEditDlg.js
@@ -271,7 +271,6 @@ define([
if (state == 'ok') {
if (this.locked) {
Common.UI.alert({
- closable: false,
msg: this.errorCreateDefName,
title: this.notcriticalErrorTitle,
iconCls: 'warn',