diff --git a/apps/documenteditor/embed/index.html b/apps/documenteditor/embed/index.html index ab20ccc1f2..78f2bd0c64 100644 --- a/apps/documenteditor/embed/index.html +++ b/apps/documenteditor/embed/index.html @@ -155,8 +155,7 @@ } function encodeUrlParam(str) { - return str.replace(/&/g, '&') - .replace(/"/g, '"') + return str.replace(/"/g, '"') .replace(/'/g, ''') .replace(//g, '>'); diff --git a/apps/documenteditor/embed/index.html.deploy b/apps/documenteditor/embed/index.html.deploy index c6c09db65d..75f228d984 100644 --- a/apps/documenteditor/embed/index.html.deploy +++ b/apps/documenteditor/embed/index.html.deploy @@ -148,8 +148,7 @@ } function encodeUrlParam(str) { - return str.replace(/&/g, '&') - .replace(/"/g, '"') + return str.replace(/"/g, '"') .replace(/'/g, ''') .replace(//g, '>'); diff --git a/apps/documenteditor/embed/index_loader.html b/apps/documenteditor/embed/index_loader.html index 938ddb42f0..0d25bab6b1 100644 --- a/apps/documenteditor/embed/index_loader.html +++ b/apps/documenteditor/embed/index_loader.html @@ -225,8 +225,7 @@ } function encodeUrlParam(str) { - return str.replace(/&/g, '&') - .replace(/"/g, '"') + return str.replace(/"/g, '"') .replace(/'/g, ''') .replace(//g, '>'); diff --git a/apps/documenteditor/embed/index_loader.html.deploy b/apps/documenteditor/embed/index_loader.html.deploy index 29f7ab10ce..ec68112af3 100644 --- a/apps/documenteditor/embed/index_loader.html.deploy +++ b/apps/documenteditor/embed/index_loader.html.deploy @@ -217,8 +217,7 @@ } function encodeUrlParam(str) { - return str.replace(/&/g, '&') - .replace(/"/g, '"') + return str.replace(/"/g, '"') .replace(/'/g, ''') .replace(//g, '>'); diff --git a/apps/documenteditor/embed/js/ApplicationController.js b/apps/documenteditor/embed/js/ApplicationController.js index ddc3b73634..5a306ed6a8 100644 --- a/apps/documenteditor/embed/js/ApplicationController.js +++ b/apps/documenteditor/embed/js/ApplicationController.js @@ -625,6 +625,11 @@ DE.ApplicationController = new(function(){ message = me.errorEditingDownloadas; break; + case Asc.c_oAscError.ID.ForceSaveButton: + case Asc.c_oAscError.ID.ForceSaveTimeout: + message = me.errorForceSave; + break; + default: message = me.errorDefaultMessage.replace('%1', id); break; @@ -806,6 +811,7 @@ DE.ApplicationController = new(function(){ textGuest: 'Guest', textAnonymous: 'Anonymous', textRequired: 'Fill all required fields to send form.', - textGotIt: 'Got it' + textGotIt: 'Got it', + errorForceSave: "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later." } })(); \ No newline at end of file diff --git a/apps/documenteditor/embed/locale/en.json b/apps/documenteditor/embed/locale/en.json index d1d9306a26..de0c0c2915 100644 --- a/apps/documenteditor/embed/locale/en.json +++ b/apps/documenteditor/embed/locale/en.json @@ -17,6 +17,7 @@ "DE.ApplicationController.errorSubmit": "Submit failed.", "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Internet connection has been restored, and the file version has been changed.
Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.", "DE.ApplicationController.errorUserDrop": "The file cannot be accessed right now.", + "DE.ApplicationController.errorForceSave": "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later.", "DE.ApplicationController.notcriticalErrorTitle": "Warning", "DE.ApplicationController.scriptLoadError": "The connection is too slow, some of the components could not be loaded. Please reload the page.", "DE.ApplicationController.textAnonymous": "Anonymous", diff --git a/apps/documenteditor/main/index.html b/apps/documenteditor/main/index.html index 71bc2810b0..830da09be6 100644 --- a/apps/documenteditor/main/index.html +++ b/apps/documenteditor/main/index.html @@ -225,8 +225,7 @@ } function encodeUrlParam(str) { - return str.replace(/&/g, '&') - .replace(/"/g, '"') + return str.replace(/"/g, '"') .replace(/'/g, ''') .replace(//g, '>'); diff --git a/apps/documenteditor/main/index.html.deploy b/apps/documenteditor/main/index.html.deploy index 6387529ff2..b8e2aababe 100644 --- a/apps/documenteditor/main/index.html.deploy +++ b/apps/documenteditor/main/index.html.deploy @@ -197,8 +197,7 @@ } function encodeUrlParam(str) { - return str.replace(/&/g, '&') - .replace(/"/g, '"') + return str.replace(/"/g, '"') .replace(/'/g, ''') .replace(//g, '>'); diff --git a/apps/documenteditor/main/index_loader.html b/apps/documenteditor/main/index_loader.html index f1fe2ae1bf..ec8d053405 100644 --- a/apps/documenteditor/main/index_loader.html +++ b/apps/documenteditor/main/index_loader.html @@ -199,8 +199,7 @@ return urlParams; } function encodeUrlParam(str) { - return str.replace(/&/g, '&') - .replace(/"/g, '"') + return str.replace(/"/g, '"') .replace(/'/g, ''') .replace(//g, '>'); diff --git a/apps/documenteditor/main/index_loader.html.deploy b/apps/documenteditor/main/index_loader.html.deploy index 13d327a223..98047eef30 100644 --- a/apps/documenteditor/main/index_loader.html.deploy +++ b/apps/documenteditor/main/index_loader.html.deploy @@ -218,8 +218,7 @@ } function encodeUrlParam(str) { - return str.replace(/&/g, '&') - .replace(/"/g, '"') + return str.replace(/"/g, '"') .replace(/'/g, ''') .replace(//g, '>'); diff --git a/apps/presentationeditor/embed/index.html b/apps/presentationeditor/embed/index.html index 991f9b6274..9442d0f3e4 100644 --- a/apps/presentationeditor/embed/index.html +++ b/apps/presentationeditor/embed/index.html @@ -206,8 +206,7 @@ } function encodeUrlParam(str) { - return str.replace(/&/g, '&') - .replace(/"/g, '"') + return str.replace(/"/g, '"') .replace(/'/g, ''') .replace(//g, '>'); diff --git a/apps/presentationeditor/embed/index.html.deploy b/apps/presentationeditor/embed/index.html.deploy index a3a0347ab1..ea2f15713a 100644 --- a/apps/presentationeditor/embed/index.html.deploy +++ b/apps/presentationeditor/embed/index.html.deploy @@ -200,8 +200,7 @@ } function encodeUrlParam(str) { - return str.replace(/&/g, '&') - .replace(/"/g, '"') + return str.replace(/"/g, '"') .replace(/'/g, ''') .replace(//g, '>'); diff --git a/apps/presentationeditor/embed/index_loader.html b/apps/presentationeditor/embed/index_loader.html index e90de1d353..5b3142e623 100644 --- a/apps/presentationeditor/embed/index_loader.html +++ b/apps/presentationeditor/embed/index_loader.html @@ -224,8 +224,7 @@ } function encodeUrlParam(str) { - return str.replace(/&/g, '&') - .replace(/"/g, '"') + return str.replace(/"/g, '"') .replace(/'/g, ''') .replace(//g, '>'); diff --git a/apps/presentationeditor/embed/index_loader.html.deploy b/apps/presentationeditor/embed/index_loader.html.deploy index ee5f914c6d..f69ed41d98 100644 --- a/apps/presentationeditor/embed/index_loader.html.deploy +++ b/apps/presentationeditor/embed/index_loader.html.deploy @@ -217,8 +217,7 @@ } function encodeUrlParam(str) { - return str.replace(/&/g, '&') - .replace(/"/g, '"') + return str.replace(/"/g, '"') .replace(/'/g, ''') .replace(//g, '>'); diff --git a/apps/presentationeditor/embed/js/ApplicationController.js b/apps/presentationeditor/embed/js/ApplicationController.js index 78df5f6a25..421898910f 100644 --- a/apps/presentationeditor/embed/js/ApplicationController.js +++ b/apps/presentationeditor/embed/js/ApplicationController.js @@ -568,6 +568,11 @@ PE.ApplicationController = new(function(){ message = me.errorAccessDeny; break; + case Asc.c_oAscError.ID.ForceSaveButton: + case Asc.c_oAscError.ID.ForceSaveTimeout: + message = me.errorForceSave; + break; + default: message = me.errorDefaultMessage.replace('%1', id); break; @@ -712,6 +717,7 @@ PE.ApplicationController = new(function(){ errorFileSizeExceed: 'The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.', errorUpdateVersionOnDisconnect: 'Internet connection has been restored, and the file version has been changed.
Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.', textGuest: 'Guest', - textAnonymous: 'Anonymous' + textAnonymous: 'Anonymous', + errorForceSave: "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later." } })(); diff --git a/apps/presentationeditor/embed/locale/en.json b/apps/presentationeditor/embed/locale/en.json index f2de99d905..84ffc91f6c 100644 --- a/apps/presentationeditor/embed/locale/en.json +++ b/apps/presentationeditor/embed/locale/en.json @@ -15,6 +15,7 @@ "PE.ApplicationController.errorFileSizeExceed": "The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.", "PE.ApplicationController.errorUpdateVersionOnDisconnect": "Internet connection has been restored, and the file version has been changed.
Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.", "PE.ApplicationController.errorUserDrop": "The file cannot be accessed right now.", + "PE.ApplicationController.errorForceSave": "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later.", "PE.ApplicationController.notcriticalErrorTitle": "Warning", "PE.ApplicationController.scriptLoadError": "The connection is too slow, some of the components could not be loaded. Please reload the page.", "PE.ApplicationController.textAnonymous": "Anonymous", diff --git a/apps/presentationeditor/main/index.html b/apps/presentationeditor/main/index.html index cd541ff812..a2f0768cc3 100644 --- a/apps/presentationeditor/main/index.html +++ b/apps/presentationeditor/main/index.html @@ -247,8 +247,7 @@ } function encodeUrlParam(str) { - return str.replace(/&/g, '&') - .replace(/"/g, '"') + return str.replace(/"/g, '"') .replace(/'/g, ''') .replace(//g, '>'); diff --git a/apps/presentationeditor/main/index.html.deploy b/apps/presentationeditor/main/index.html.deploy index becd100477..03ea9135fd 100644 --- a/apps/presentationeditor/main/index.html.deploy +++ b/apps/presentationeditor/main/index.html.deploy @@ -239,8 +239,7 @@ } function encodeUrlParam(str) { - return str.replace(/&/g, '&') - .replace(/"/g, '"') + return str.replace(/"/g, '"') .replace(/'/g, ''') .replace(//g, '>'); diff --git a/apps/presentationeditor/main/index_loader.html b/apps/presentationeditor/main/index_loader.html index 2903b7bf74..96110678b3 100644 --- a/apps/presentationeditor/main/index_loader.html +++ b/apps/presentationeditor/main/index_loader.html @@ -190,8 +190,7 @@ return urlParams; } function encodeUrlParam(str) { - return str.replace(/&/g, '&') - .replace(/"/g, '"') + return str.replace(/"/g, '"') .replace(/'/g, ''') .replace(//g, '>'); diff --git a/apps/presentationeditor/main/index_loader.html.deploy b/apps/presentationeditor/main/index_loader.html.deploy index 2ded00a17e..abec1311c1 100644 --- a/apps/presentationeditor/main/index_loader.html.deploy +++ b/apps/presentationeditor/main/index_loader.html.deploy @@ -218,8 +218,7 @@ } function encodeUrlParam(str) { - return str.replace(/&/g, '&') - .replace(/"/g, '"') + return str.replace(/"/g, '"') .replace(/'/g, ''') .replace(//g, '>'); diff --git a/apps/spreadsheeteditor/embed/index.html b/apps/spreadsheeteditor/embed/index.html index c21511fc46..dcee9f69e5 100644 --- a/apps/spreadsheeteditor/embed/index.html +++ b/apps/spreadsheeteditor/embed/index.html @@ -181,8 +181,7 @@ } function encodeUrlParam(str) { - return str.replace(/&/g, '&') - .replace(/"/g, '"') + return str.replace(/"/g, '"') .replace(/'/g, ''') .replace(//g, '>'); diff --git a/apps/spreadsheeteditor/embed/index.html.deploy b/apps/spreadsheeteditor/embed/index.html.deploy index 50678b73f0..3406f76573 100644 --- a/apps/spreadsheeteditor/embed/index.html.deploy +++ b/apps/spreadsheeteditor/embed/index.html.deploy @@ -173,8 +173,7 @@ } function encodeUrlParam(str) { - return str.replace(/&/g, '&') - .replace(/"/g, '"') + return str.replace(/"/g, '"') .replace(/'/g, ''') .replace(//g, '>'); diff --git a/apps/spreadsheeteditor/embed/index_loader.html b/apps/spreadsheeteditor/embed/index_loader.html index dffe443058..7e37cb96cd 100644 --- a/apps/spreadsheeteditor/embed/index_loader.html +++ b/apps/spreadsheeteditor/embed/index_loader.html @@ -225,8 +225,7 @@ } function encodeUrlParam(str) { - return str.replace(/&/g, '&') - .replace(/"/g, '"') + return str.replace(/"/g, '"') .replace(/'/g, ''') .replace(//g, '>'); diff --git a/apps/spreadsheeteditor/embed/index_loader.html.deploy b/apps/spreadsheeteditor/embed/index_loader.html.deploy index 0971259833..3459e52ad5 100644 --- a/apps/spreadsheeteditor/embed/index_loader.html.deploy +++ b/apps/spreadsheeteditor/embed/index_loader.html.deploy @@ -217,8 +217,7 @@ } function encodeUrlParam(str) { - return str.replace(/&/g, '&') - .replace(/"/g, '"') + return str.replace(/"/g, '"') .replace(/'/g, ''') .replace(//g, '>'); diff --git a/apps/spreadsheeteditor/embed/js/ApplicationController.js b/apps/spreadsheeteditor/embed/js/ApplicationController.js index c2dd584dae..c2f7cec9a9 100644 --- a/apps/spreadsheeteditor/embed/js/ApplicationController.js +++ b/apps/spreadsheeteditor/embed/js/ApplicationController.js @@ -481,6 +481,11 @@ SSE.ApplicationController = new(function(){ message = me.errorAccessDeny; break; + case Asc.c_oAscError.ID.ForceSaveButton: + case Asc.c_oAscError.ID.ForceSaveTimeout: + message = me.errorForceSave; + break; + default: message = me.errorDefaultMessage.replace('%1', id); break; @@ -663,6 +668,7 @@ SSE.ApplicationController = new(function(){ errorFileSizeExceed: 'The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.', errorUpdateVersionOnDisconnect: 'Internet connection has been restored, and the file version has been changed.
Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.', textGuest: 'Guest', - textAnonymous: 'Anonymous' + textAnonymous: 'Anonymous', + errorForceSave: "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later." } })(); \ No newline at end of file diff --git a/apps/spreadsheeteditor/embed/locale/en.json b/apps/spreadsheeteditor/embed/locale/en.json index 4485edab09..0fb957b692 100644 --- a/apps/spreadsheeteditor/embed/locale/en.json +++ b/apps/spreadsheeteditor/embed/locale/en.json @@ -15,6 +15,7 @@ "SSE.ApplicationController.errorFileSizeExceed": "The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.", "SSE.ApplicationController.errorUpdateVersionOnDisconnect": "Internet connection has been restored, and the file version has been changed.
Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.", "SSE.ApplicationController.errorUserDrop": "The file cannot be accessed right now.", + "SSE.ApplicationController.errorForceSave": "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later.", "SSE.ApplicationController.notcriticalErrorTitle": "Warning", "SSE.ApplicationController.scriptLoadError": "The connection is too slow, some of the components could not be loaded. Please reload the page.", "SSE.ApplicationController.textAnonymous": "Anonymous", diff --git a/apps/spreadsheeteditor/main/index.html b/apps/spreadsheeteditor/main/index.html index 3fc0f9f9fd..37adc535f6 100644 --- a/apps/spreadsheeteditor/main/index.html +++ b/apps/spreadsheeteditor/main/index.html @@ -254,8 +254,7 @@ } function encodeUrlParam(str) { - return str.replace(/&/g, '&') - .replace(/"/g, '"') + return str.replace(/"/g, '"') .replace(/'/g, ''') .replace(//g, '>'); diff --git a/apps/spreadsheeteditor/main/index.html.deploy b/apps/spreadsheeteditor/main/index.html.deploy index bf67081987..0cd52cb5eb 100644 --- a/apps/spreadsheeteditor/main/index.html.deploy +++ b/apps/spreadsheeteditor/main/index.html.deploy @@ -239,8 +239,7 @@ } function encodeUrlParam(str) { - return str.replace(/&/g, '&') - .replace(/"/g, '"') + return str.replace(/"/g, '"') .replace(/'/g, ''') .replace(//g, '>'); diff --git a/apps/spreadsheeteditor/main/index_loader.html b/apps/spreadsheeteditor/main/index_loader.html index 8c64256616..921ad7e461 100644 --- a/apps/spreadsheeteditor/main/index_loader.html +++ b/apps/spreadsheeteditor/main/index_loader.html @@ -189,8 +189,7 @@ return urlParams; } function encodeUrlParam(str) { - return str.replace(/&/g, '&') - .replace(/"/g, '"') + return str.replace(/"/g, '"') .replace(/'/g, ''') .replace(//g, '>'); diff --git a/apps/spreadsheeteditor/main/index_loader.html.deploy b/apps/spreadsheeteditor/main/index_loader.html.deploy index 884f65146c..a37a6dd03f 100644 --- a/apps/spreadsheeteditor/main/index_loader.html.deploy +++ b/apps/spreadsheeteditor/main/index_loader.html.deploy @@ -217,8 +217,7 @@ } function encodeUrlParam(str) { - return str.replace(/&/g, '&') - .replace(/"/g, '"') + return str.replace(/"/g, '"') .replace(/'/g, ''') .replace(//g, '>');