diff --git a/apps/documenteditor/forms/app/controller/ApplicationController.js b/apps/documenteditor/forms/app/controller/ApplicationController.js
index 672795458..d0a76a0f6 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 9113d5d23..e1bd0cc0e 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 @@
<!--[if lt IE 9]>
<script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.6.1/html5shiv.js"></script>
<![endif]-->
+ <script src="../../common/main/lib/util/themeinit.js"></script>
</head>
<body class="embed-body theme-classic-light theme-type-light">
@@ -126,7 +127,8 @@
<script>
var userAgent = navigator.userAgent.toLowerCase(),
- check = function(regex){ return regex.test(userAgent); };
+ check = function(regex){ return regex.test(userAgent); },
+ stopLoading = false;
if (!check(/opera/) && (check(/msie/) || check(/trident/))) {
var m = /msie (\d+\.\d+)/.exec(userAgent);
if (m && parseFloat(m[1]) < 10.0) {
@@ -134,11 +136,20 @@
'<div id="id-error-mask" class="errormask">',
'<div class="error-body" align="center">',
'<div id="id-error-mask-title" class="title">Your browser is not supported.</div>',
- '<div id="id-error-mask-text">Sorry, ONLYOFFICE Document is currently only supported in the latest versions of the Chrome, Firefox, Safari or Internet Explorer web browsers.</div>',
+ '<div id="id-error-mask-text">Sorry, Document Editor is currently only supported in the latest versions of the Chrome, Firefox, Safari or Internet Explorer web browsers.</div>',
'</div>',
'</div>'
);
+ stopLoading = true;
}
+ } else
+ if (check(/windows\snt/i)) {
+ var re = /chrome\/(\d+)/i.exec(userAgent);
+ if (!!re && !!re[1] && !(re[1] > 49)) {
+ setTimeout(function () {
+ document.getElementsByTagName('body')[0].className += "winxp";
+ },0);
+ }
}
function getUrlParams() {
@@ -169,14 +180,21 @@
window.frameEditorId = params["frameEditorId"];
window.parentOrigin = params["parentOrigin"];
- var elem = document.querySelector('.loading-logo');
- if (elem && logo) {
- elem.style.backgroundImage= 'none';
- var img = document.querySelector('.loading-logo img');
- img && img.setAttribute('src', logo);
- img.style.opacity = 1;
+ if(/MSIE \d|Trident.*rv:/.test(navigator.userAgent))
+ document.write('<script src="../../common/main/lib/util/fix-ie-compat.js"><\/script>');
+
+ if (stopLoading) {
+ document.body.removeChild(document.getElementById('loading-mask'));
+ } else {
+ var elem = document.querySelector('.loading-logo');
+ if (elem && logo) {
+ elem.style.backgroundImage= 'none';
+ var img = document.querySelector('.loading-logo img');
+ img && img.setAttribute('src', logo);
+ img.style.opacity = 1;
+ }
}
- </script>
+ </script>
<div id="editor_sdk" class="viewer" style="overflow: hidden;" tabindex="-1"></div>
@@ -208,10 +226,6 @@
<!--vendor-->
<script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script>
- <script type="text/javascript" src="../../../vendor/jquery.browser/dist/jquery.browser.min.js"></script>
- <!--<script type="text/javascript" src="../../../vendor/bootstrap/dist/js/bootstrap.js"></script>-->
-
- <!--<script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script>-->
<script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
<script type="text/javascript" src="../../../../sdkjs/develop/sdkjs/word/scripts.js"></script>
@@ -219,28 +233,17 @@
window.sdk_scripts.forEach(function(item){
document.write('<script type="text/javascript" src="' + item + '"><\/script>');
});
- </script>
+ window.requireTimeourError = function(){
+ var reqerr;
- <!--application-->
- <script type="text/javascript">
- var isBrowserSupported = function() {
- return ($.browser.msie && parseFloat($.browser.version) > 9) ||
- ($.browser.chrome && parseFloat($.browser.version) > 7) ||
- ($.browser.safari && parseFloat($.browser.version) > 4) ||
- ($.browser.opera && parseFloat($.browser.version) > 10.4) ||
- ($.browser.mozilla && parseFloat($.browser.version) > 3.9);
+ 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.';
+
+ return reqerr;
};
-
- if (!isBrowserSupported()){
- document.write(
- '<div id="id-error-mask" class="errormask">',
- '<div class="error-body" align="center">',
- '<div id="id-error-mask-title" class="title">Your browser is not supported.</div>',
- '<div id="id-error-mask-text">Sorry, ONLYOFFICE Document is currently only supported in the latest versions of the Chrome, Firefox, Safari or Internet Explorer web browsers.</div>',
- '</div>',
- '</div>'
- );
- }
</script>
<script data-main="app_dev" src="../../../vendor/requirejs/require.js"></script>
</body>
diff --git a/apps/documenteditor/forms/index.html.deploy b/apps/documenteditor/forms/index.html.deploy
index ed77608fc..3894cbdcd 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 @@
<script>
var userAgent = navigator.userAgent.toLowerCase(),
- check = function(regex){ return regex.test(userAgent); };
+ check = function(regex){ return regex.test(userAgent); },
+ stopLoading = false;
if (!check(/opera/) && (check(/msie/) || check(/trident/))) {
var m = /msie (\d+\.\d+)/.exec(userAgent);
if (m && parseFloat(m[1]) < 10.0) {
@@ -127,12 +128,21 @@
'<div id="id-error-mask" class="errormask">',
'<div class="error-body" align="center">',
'<div id="id-error-mask-title" class="title">Your browser is not supported.</div>',
- '<div id="id-error-mask-text">Sorry, ONLYOFFICE Document is currently only supported in the latest versions of the Chrome, Firefox, Safari or Internet Explorer web browsers.</div>',
+ '<div id="id-error-mask-text">Sorry, Document Editor is currently only supported in the latest versions of the Chrome, Firefox, Safari or Internet Explorer web browsers.</div>',
'</div>',
'</div>'
);
+ stopLoading = true;
}
- }
+ } else
+ if (check(/windows\snt/i)) {
+ var re = /chrome\/(\d+)/i.exec(userAgent);
+ if (!!re && !!re[1] && !(re[1] > 49)) {
+ setTimeout(function () {
+ document.getElementsByTagName('html')[0].className += "winxp";
+ },0);
+ }
+ }
function getUrlParams() {
var e,
@@ -197,30 +207,44 @@
<span id="box-tools"></span>
</div>
</div>
+ <script>
+ if (stopLoading) {
+ document.body.removeChild(document.getElementById('loading-mask'));
+ } else {
+ var elem = document.querySelector('.loading-logo img');
+ if (elem) {
+ logo && (elem.setAttribute('src', logo));
+ elem.style.opacity = 1;
+ }
+ }
+ </script>
+ <script>
+ window.requireTimeourError = function(){
+ var reqerr;
- <script type="text/javascript" src="../../../vendor/jquery/jquery.browser.min.js"></script>
+ 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.';
- <!--application-->
- <script type="text/javascript">
- var isBrowserSupported = function() {
- return ($.browser.msie && parseFloat($.browser.version) > 9) ||
- ($.browser.chrome && parseFloat($.browser.version) > 7) ||
- ($.browser.safari && parseFloat($.browser.version) > 4) ||
- ($.browser.opera && parseFloat($.browser.version) > 10.4) ||
- ($.browser.mozilla && parseFloat($.browser.version) > 3.9);
+ return reqerr;
};
- if (!isBrowserSupported()){
- document.write(
- '<div id="id-error-mask" class="errormask">',
- '<div class="error-body" align="center">',
- '<div id="id-error-mask-title" class="title">Your browser is not supported.</div>',
- '<div id="id-error-mask-text">Sorry, ONLYOFFICE Document is currently only supported in the latest versions of the Chrome, Firefox, Safari or Internet Explorer web browsers.</div>',
- '</div>',
- '</div>'
- );
- }
+ var requireTimeoutID = setTimeout(function(){
+ window.alert(window.requireTimeourError());
+ window.location.reload();
+ }, 30000);
+
+ var require = {
+ waitSeconds: 30,
+ callback: function(){
+ clearTimeout(requireTimeoutID);
+ }
+ };
</script>
+ <!--application-->
+ <script src="../../../../../../sdkjs/common/device_scale.js?__inline=true"></script>
<script data-main="app" src="../../../vendor/requirejs/require.js"></script>
</body>
</html>