[PE][SSE] Add script loading error.

This commit is contained in:
Julia Radzhabova 2018-10-08 17:06:37 +03:00
parent a499f55067
commit 67fb9ceea5
13 changed files with 67 additions and 6 deletions

View file

@ -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;
}

View file

@ -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.",

View file

@ -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",

View file

@ -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.'
}
})();

View file

@ -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.<br>If you need it, please contact Sales Department'
textLicencePaidFeature: 'The feature you are trying to use is available for additional payment.<br>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 || {}))
});

View file

@ -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.",

View file

@ -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.<br>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.<br>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 || {}))
});

View file

@ -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",

View file

@ -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.'
}
})();

View file

@ -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.<br>If you need it, please contact Sales Department'
textLicencePaidFeature: 'The feature you are trying to use is available for additional payment.<br>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 || {}))
});

View file

@ -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",

View file

@ -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.<br>Please check the data and try again.',
errorCopyMultiselectArea: 'This command cannot be used with multiple selections.<br>Select a single range and try again.',
errorPrintMaxPagesCount: 'Unfortunately, its not possible to print more than 1500 pages at once in the current version of the program.<br>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 || {}))
});

View file

@ -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",