diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js
index ddc7215de..aa6caf0b3 100644
--- a/apps/documenteditor/main/app/controller/Main.js
+++ b/apps/documenteditor/main/app/controller/Main.js
@@ -1290,6 +1290,7 @@ define([
onError: function(id, level, errData) {
if (id == Asc.c_oAscError.ID.LoadingScriptError) {
this.showTips([this.scriptLoadError]);
+ this.tooltip && this.tooltip.getBSTip().$tip.css('z-index', 10000);
return;
}
diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json
index 12c5d6b9c..8a4713784 100644
--- a/apps/documenteditor/main/locale/en.json
+++ b/apps/documenteditor/main/locale/en.json
@@ -383,6 +383,7 @@
"DE.Controllers.Main.saveTitleText": "Saving Document",
"DE.Controllers.Main.sendMergeText": "Sending Merge...",
"DE.Controllers.Main.sendMergeTitle": "Sending Merge",
+ "DE.Controllers.Main.scriptLoadError": "The connection is too slow, some of the components could not be loaded. Please reload the page.",
"DE.Controllers.Main.splitDividerErrorText": "The number of rows must be a divisor of %1.",
"DE.Controllers.Main.splitMaxColsErrorText": "The number of columns must be less than %1.",
"DE.Controllers.Main.splitMaxRowsErrorText": "The number of rows must be less than %1.",
diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json
index 4b020176b..f7fe59537 100644
--- a/apps/documenteditor/mobile/locale/en.json
+++ b/apps/documenteditor/mobile/locale/en.json
@@ -98,6 +98,7 @@
"DE.Controllers.Main.saveTitleText": "Saving Document",
"DE.Controllers.Main.sendMergeText": "Sending Merge...",
"DE.Controllers.Main.sendMergeTitle": "Sending Merge",
+ "DE.Controllers.Main.scriptLoadError": "The connection is too slow, some of the components could not be loaded. Please reload the page.",
"DE.Controllers.Main.splitDividerErrorText": "The number of rows must be a divisor of %1",
"DE.Controllers.Main.splitMaxColsErrorText": "The number of columns must be less than %1",
"DE.Controllers.Main.splitMaxRowsErrorText": "The number of rows must be less than %1",
diff --git a/apps/presentationeditor/embed/js/ApplicationController.js b/apps/presentationeditor/embed/js/ApplicationController.js
index 0f33ee84b..788d131cc 100644
--- a/apps/presentationeditor/embed/js/ApplicationController.js
+++ b/apps/presentationeditor/embed/js/ApplicationController.js
@@ -459,6 +459,16 @@ var ApplicationController = new(function(){
}
function onError(id, level, errData) {
+ if (id == Asc.c_oAscError.ID.LoadingScriptError) {
+ $('#id-critical-error-title').text(me.criticalErrorTitle);
+ $('#id-critical-error-message').text(me.scriptLoadError);
+ $('#id-critical-error-close').off().on('click', function(){
+ window.location.reload();
+ });
+ $('#id-critical-error-dialog').css('z-index', 20002).modal('show');
+ return;
+ }
+
hidePreloader();
var message;
@@ -595,6 +605,7 @@ var ApplicationController = new(function(){
convertationErrorText : 'Convertation failed.',
downloadErrorText : 'Download failed.',
criticalErrorTitle : 'Error',
- notcriticalErrorTitle : 'Warning'
+ notcriticalErrorTitle : 'Warning',
+ scriptLoadError: 'The connection is too slow, some of the components could not be loaded. Please reload the page.'
}
})();
diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js
index cc33295dc..53f7c1cc6 100644
--- a/apps/presentationeditor/main/app/controller/Main.js
+++ b/apps/presentationeditor/main/app/controller/Main.js
@@ -1030,6 +1030,12 @@ define([
},
onError: function(id, level, errData) {
+ if (id == Asc.c_oAscError.ID.LoadingScriptError) {
+ this.showTips([this.scriptLoadError]);
+ this.tooltip && this.tooltip.getBSTip().$tip.css('z-index', 10000);
+ return;
+ }
+
this.hidePreloader();
this.onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
@@ -2069,7 +2075,8 @@ define([
errorDataEncrypted: 'Encrypted changes have been received, they cannot be deciphered.',
textClose: 'Close',
textPaidFeature: 'Paid feature',
- textLicencePaidFeature: 'The feature you are trying to use is available for additional payment.
If you need it, please contact Sales Department'
+ textLicencePaidFeature: 'The feature you are trying to use is available for additional payment.
If you need it, please contact Sales Department',
+ scriptLoadError: 'The connection is too slow, some of the components could not be loaded. Please reload the page.'
}
})(), PE.Controllers.Main || {}))
});
diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json
index 3d3b009e0..85953a51e 100644
--- a/apps/presentationeditor/main/locale/en.json
+++ b/apps/presentationeditor/main/locale/en.json
@@ -292,6 +292,7 @@
"PE.Controllers.Main.savePreparingTitle": "Preparing to save. Please wait...",
"PE.Controllers.Main.saveTextText": "Saving presentation...",
"PE.Controllers.Main.saveTitleText": "Saving Presentation",
+ "PE.Controllers.Main.scriptLoadError": "The connection is too slow, some of the components could not be loaded. Please reload the page.",
"PE.Controllers.Main.splitDividerErrorText": "The number of rows must be a divisor of %1.",
"PE.Controllers.Main.splitMaxColsErrorText": "The number of columns must be less than %1.",
"PE.Controllers.Main.splitMaxRowsErrorText": "The number of rows must be less than %1.",
diff --git a/apps/presentationeditor/mobile/app/controller/Main.js b/apps/presentationeditor/mobile/app/controller/Main.js
index 4cc20fff8..5711d4b2d 100644
--- a/apps/presentationeditor/mobile/app/controller/Main.js
+++ b/apps/presentationeditor/mobile/app/controller/Main.js
@@ -725,6 +725,14 @@ define([
},
onError: function(id, level, errData) {
+ if (id == Asc.c_oAscError.ID.LoadingScriptError) {
+ uiApp.addNotification({
+ title: this.criticalErrorTitle,
+ message: this.scriptLoadError
+ });
+ return;
+ }
+
this.hidePreloader();
this.onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
@@ -1339,7 +1347,8 @@ define([
warnLicenseExceeded: 'The number of concurrent connections to the document server has been exceeded and the document will be opened for viewing only.
Please contact your administrator for more information.',
warnLicenseUsersExceeded: 'The number of concurrent users has been exceeded and the document will be opened for viewing only.
Please contact your administrator for more information.',
errorDataEncrypted: 'Encrypted changes have been received, they cannot be deciphered.',
- closeButtonText: 'Close File'
+ closeButtonText: 'Close File',
+ scriptLoadError: 'The connection is too slow, some of the components could not be loaded. Please reload the page.'
}
})(), PE.Controllers.Main || {}))
});
\ No newline at end of file
diff --git a/apps/presentationeditor/mobile/locale/en.json b/apps/presentationeditor/mobile/locale/en.json
index 2f24d5627..b7e512bed 100644
--- a/apps/presentationeditor/mobile/locale/en.json
+++ b/apps/presentationeditor/mobile/locale/en.json
@@ -112,6 +112,7 @@
"PE.Controllers.Main.savePreparingTitle": "Preparing to save. Please wait...",
"PE.Controllers.Main.saveTextText": "Saving document...",
"PE.Controllers.Main.saveTitleText": "Saving Document",
+ "PE.Controllers.Main.scriptLoadError": "The connection is too slow, some of the components could not be loaded. Please reload the page.",
"PE.Controllers.Main.splitDividerErrorText": "The number of rows must be a divisor of %1",
"PE.Controllers.Main.splitMaxColsErrorText": "The number of columns must be less than %1",
"PE.Controllers.Main.splitMaxRowsErrorText": "The number of rows must be less than %1",
diff --git a/apps/spreadsheeteditor/embed/js/ApplicationController.js b/apps/spreadsheeteditor/embed/js/ApplicationController.js
index 118fcce0b..530995893 100644
--- a/apps/spreadsheeteditor/embed/js/ApplicationController.js
+++ b/apps/spreadsheeteditor/embed/js/ApplicationController.js
@@ -367,6 +367,16 @@ var ApplicationController = new(function(){
}
function onError(id, level, errData) {
+ if (id == Asc.c_oAscError.ID.LoadingScriptError) {
+ $('#id-critical-error-title').text(me.criticalErrorTitle);
+ $('#id-critical-error-message').text(me.scriptLoadError);
+ $('#id-critical-error-close').off().on('click', function(){
+ window.location.reload();
+ });
+ $('#id-critical-error-dialog').css('z-index', 20002).modal('show');
+ return;
+ }
+
hidePreloader();
var message;
@@ -542,6 +552,7 @@ var ApplicationController = new(function(){
convertationErrorText : 'Convertation failed.',
downloadErrorText : 'Download failed.',
criticalErrorTitle : 'Error',
- notcriticalErrorTitle : 'Warning'
+ notcriticalErrorTitle : 'Warning',
+ scriptLoadError: 'The connection is too slow, some of the components could not be loaded. Please reload the page.'
}
})();
\ No newline at end of file
diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js
index e8b0728da..f8f73f8e6 100644
--- a/apps/spreadsheeteditor/main/app/controller/Main.js
+++ b/apps/spreadsheeteditor/main/app/controller/Main.js
@@ -1090,6 +1090,12 @@ define([
},
onError: function(id, level, errData) {
+ if (id == Asc.c_oAscError.ID.LoadingScriptError) {
+ this.showTips([this.scriptLoadError]);
+ this.tooltip && this.tooltip.getBSTip().$tip.css('z-index', 10000);
+ return;
+ }
+
this.hidePreloader();
this.onLongActionEnd(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument);
@@ -2248,7 +2254,8 @@ define([
errorDataEncrypted: 'Encrypted changes have been received, they cannot be deciphered.',
textClose: 'Close',
textPaidFeature: 'Paid feature',
- textLicencePaidFeature: 'The feature you are trying to use is available for additional payment.
If you need it, please contact Sales Department'
+ textLicencePaidFeature: 'The feature you are trying to use is available for additional payment.
If you need it, please contact Sales Department',
+ scriptLoadError: 'The connection is too slow, some of the components could not be loaded. Please reload the page.'
}
})(), SSE.Controllers.Main || {}))
});
diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json
index 91758e92e..9ab098eaa 100644
--- a/apps/spreadsheeteditor/main/locale/en.json
+++ b/apps/spreadsheeteditor/main/locale/en.json
@@ -465,6 +465,7 @@
"SSE.Controllers.Main.savePreparingTitle": "Preparing to save. Please wait...",
"SSE.Controllers.Main.saveTextText": "Saving spreadsheet...",
"SSE.Controllers.Main.saveTitleText": "Saving Spreadsheet",
+ "SSE.Controllers.Main.scriptLoadError": "The connection is too slow, some of the components could not be loaded. Please reload the page.",
"SSE.Controllers.Main.textAnonymous": "Anonymous",
"SSE.Controllers.Main.textBuyNow": "Visit website",
"SSE.Controllers.Main.textClose": "Close",
diff --git a/apps/spreadsheeteditor/mobile/app/controller/Main.js b/apps/spreadsheeteditor/mobile/app/controller/Main.js
index 70a934b81..63d867455 100644
--- a/apps/spreadsheeteditor/mobile/app/controller/Main.js
+++ b/apps/spreadsheeteditor/mobile/app/controller/Main.js
@@ -735,6 +735,14 @@ define([
},
onError: function(id, level, errData) {
+ if (id == Asc.c_oAscError.ID.LoadingScriptError) {
+ uiApp.addNotification({
+ title: this.criticalErrorTitle,
+ message: this.scriptLoadError
+ });
+ return;
+ }
+
this.hidePreloader();
this.onLongActionEnd(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument);
@@ -1522,7 +1530,8 @@ define([
errorFrmlWrongReferences: 'The function refers to a sheet that does not exist.
Please check the data and try again.',
errorCopyMultiselectArea: 'This command cannot be used with multiple selections.
Select a single range and try again.',
errorPrintMaxPagesCount: 'Unfortunately, it’s not possible to print more than 1500 pages at once in the current version of the program.
This restriction will be eliminated in upcoming releases.',
- closeButtonText: 'Close File'
+ closeButtonText: 'Close File',
+ scriptLoadError: 'The connection is too slow, some of the components could not be loaded. Please reload the page.'
}
})(), SSE.Controllers.Main || {}))
});
\ No newline at end of file
diff --git a/apps/spreadsheeteditor/mobile/locale/en.json b/apps/spreadsheeteditor/mobile/locale/en.json
index 8fc602870..f7e247617 100644
--- a/apps/spreadsheeteditor/mobile/locale/en.json
+++ b/apps/spreadsheeteditor/mobile/locale/en.json
@@ -190,6 +190,7 @@
"SSE.Controllers.Main.saveTitleText": "Saving Document",
"SSE.Controllers.Main.sendMergeText": "Sending Merge...",
"SSE.Controllers.Main.sendMergeTitle": "Sending Merge",
+ "SSE.Controllers.Main.scriptLoadError": "The connection is too slow, some of the components could not be loaded. Please reload the page.",
"SSE.Controllers.Main.textAnonymous": "Anonymous",
"SSE.Controllers.Main.textBack": "Back",
"SSE.Controllers.Main.textBuyNow": "Visit website",