diff --git a/apps/documenteditor/forms/app/controller/ApplicationController.js b/apps/documenteditor/forms/app/controller/ApplicationController.js index 6727954585..d0a76a0f6e 100644 --- a/apps/documenteditor/forms/app/controller/ApplicationController.js +++ b/apps/documenteditor/forms/app/controller/ApplicationController.js @@ -37,6 +37,8 @@ define([ var me = this; if (!Common.Utils.isBrowserSupported()){ Common.Utils.showBrowserRestriction(); + $('#editor_sdk').hide().remove(); + $('#toolbar').hide().remove(); Common.Gateway.reportError(undefined, this.unsupportedBrowserErrorText); return; } @@ -1200,6 +1202,8 @@ define([ 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.", textCloseTip: "Click to close the tip.", txtPressLink: 'Press Ctrl and click link', - txtEmpty: '(Empty)' + txtEmpty: '(Empty)', + titleServerVersion: 'Editor updated', + errorServerVersion: 'The editor version has been updated. The page will be reloaded to apply the changes.' }, DE.Controllers.ApplicationController)); }); diff --git a/apps/documenteditor/forms/index.html b/apps/documenteditor/forms/index.html index 9113d5d236..e1bd0cc0e1 100644 --- a/apps/documenteditor/forms/index.html +++ b/apps/documenteditor/forms/index.html @@ -23,7 +23,7 @@ overflow: hidden; border: none; background-color: #f4f4f4; - z-index: 10000; + z-index: 1001; } .loadmask > .brendpanel { @@ -113,6 +113,7 @@ + @@ -126,7 +127,8 @@ +
@@ -208,10 +226,6 @@ - - - - @@ -219,28 +233,17 @@ window.sdk_scripts.forEach(function(item){ document.write(' + window.requireTimeourError = function(){ + var reqerr; - - diff --git a/apps/documenteditor/forms/index.html.deploy b/apps/documenteditor/forms/index.html.deploy index ed77608fcb..3894cbdcd4 100644 --- a/apps/documenteditor/forms/index.html.deploy +++ b/apps/documenteditor/forms/index.html.deploy @@ -21,7 +21,7 @@ overflow: hidden; border: none; background-color: #f4f4f4; - z-index: 10000; + z-index: 1001; } .loadmask > .brendpanel { @@ -119,7 +119,8 @@ + + if ( lang == 'de') reqerr = 'Die Verbindung ist zu langsam, einige Komponenten konnten nicht geladen werden. Aktualisieren Sie bitte die Seite.'; + else if ( lang == 'es') reqerr = 'La conexión es muy lenta, algunos de los componentes no han podido cargar. Por favor recargue la página.'; + else if ( lang == 'fr') reqerr = 'La connexion est trop lente, certains des composants n\'ons pas pu être chargé. Veuillez recharger la page.'; + else if ( lang == 'ru') reqerr = 'Слишком медленное соединение, не удается загрузить некоторые компоненты. Пожалуйста, обновите страницу.'; + else reqerr = 'The connection is too slow, some of the components could not be loaded. Please reload the page.'; - - + +