From 2d8d3291c06c36057e24dbe334d0b1461ed190dd Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Thu, 22 Jun 2017 12:24:55 +0300
Subject: [PATCH] Fix Bug 35037.

---
 apps/documenteditor/main/app.js               | 33 ++-----------------
 apps/documenteditor/main/app_dev.js           | 33 ++-----------------
 apps/documenteditor/main/index.html           | 12 +++++++
 apps/documenteditor/main/index.html.deploy    | 26 +++++++++++++--
 apps/documenteditor/mobile/app-dev.js         | 33 ++-----------------
 apps/documenteditor/mobile/app.js             | 33 ++-----------------
 apps/documenteditor/mobile/index.html         | 12 +++++++
 apps/documenteditor/mobile/index.html.deploy  | 24 ++++++++++++++
 apps/presentationeditor/main/app.js           | 33 ++-----------------
 apps/presentationeditor/main/app_dev.js       | 33 ++-----------------
 apps/presentationeditor/main/index.html       | 12 +++++++
 .../presentationeditor/main/index.html.deploy | 24 ++++++++++++--
 apps/presentationeditor/mobile/app-dev.js     | 33 ++-----------------
 apps/presentationeditor/mobile/app.js         | 33 ++-----------------
 apps/presentationeditor/mobile/index.html     | 12 +++++++
 .../mobile/index.html.deploy                  | 24 ++++++++++++++
 apps/spreadsheeteditor/main/app.js            | 33 ++-----------------
 apps/spreadsheeteditor/main/app_dev.js        | 33 ++-----------------
 apps/spreadsheeteditor/main/index.html        | 12 +++++++
 apps/spreadsheeteditor/main/index.html.deploy | 24 ++++++++++++--
 apps/spreadsheeteditor/mobile/app-dev.js      | 33 ++-----------------
 apps/spreadsheeteditor/mobile/app.js          | 33 ++-----------------
 apps/spreadsheeteditor/mobile/index.html      | 12 +++++++
 .../mobile/index.html.deploy                  | 24 ++++++++++++++
 24 files changed, 235 insertions(+), 379 deletions(-)

diff --git a/apps/documenteditor/main/app.js b/apps/documenteditor/main/app.js
index 3cb20c44f..471759e72 100644
--- a/apps/documenteditor/main/app.js
+++ b/apps/documenteditor/main/app.js
@@ -200,37 +200,8 @@ require([
         app.start();
     });
 }, function(err) {
-    if (err.requireType == 'timeout' && !reqerr) {
-        var getUrlParams = function() {
-            var e,
-                a = /\+/g,  // Regex for replacing addition symbol with a space
-                r = /([^&=]+)=?([^&]*)/g,
-                d = function (s) { return decodeURIComponent(s.replace(a, " ")); },
-                q = window.location.search.substring(1),
-                urlParams = {};
-
-            while (e = r.exec(q))
-                urlParams[d(e[1])] = d(e[2]);
-
-            return urlParams;
-        };
-
-        var encodeUrlParam = function(str) {
-            return str.replace(/&/g, '&amp;')
-                    .replace(/"/g, '&quot;')
-                    .replace(/'/g, '&#39;')
-                    .replace(/</g, '&lt;')
-                    .replace(/>/g, '&gt;');
-        };
-
-        var lang = (getUrlParams()["lang"] || 'en').split("-")[0];
-
-        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.';
-
+    if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) {
+        reqerr = window.requireTimeourError();
         window.alert(reqerr);
         window.location.reload();
     }
diff --git a/apps/documenteditor/main/app_dev.js b/apps/documenteditor/main/app_dev.js
index 49d9e8fa0..ff894fd0b 100644
--- a/apps/documenteditor/main/app_dev.js
+++ b/apps/documenteditor/main/app_dev.js
@@ -191,37 +191,8 @@ require([
         app.start();
     });
 }, function(err) {
-    if (err.requireType == 'timeout' && !reqerr) {
-        var getUrlParams = function() {
-            var e,
-                a = /\+/g,  // Regex for replacing addition symbol with a space
-                r = /([^&=]+)=?([^&]*)/g,
-                d = function (s) { return decodeURIComponent(s.replace(a, " ")); },
-                q = window.location.search.substring(1),
-                urlParams = {};
-
-            while (e = r.exec(q))
-                urlParams[d(e[1])] = d(e[2]);
-
-            return urlParams;
-        };
-
-        var encodeUrlParam = function(str) {
-            return str.replace(/&/g, '&amp;')
-                    .replace(/"/g, '&quot;')
-                    .replace(/'/g, '&#39;')
-                    .replace(/</g, '&lt;')
-                    .replace(/>/g, '&gt;');
-        };
-
-        var lang = (getUrlParams()["lang"] || 'en').split("-")[0];
-
-        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.';
-
+    if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) {
+        reqerr = window.requireTimeourError();
         window.alert(reqerr);
         window.location.reload();
     }
diff --git a/apps/documenteditor/main/index.html b/apps/documenteditor/main/index.html
index ff57f1872..8b7823fe0 100644
--- a/apps/documenteditor/main/index.html
+++ b/apps/documenteditor/main/index.html
@@ -270,6 +270,18 @@
         window.sdk_dev_scrpipts.forEach(function(item){
             document.write('<script type="text/javascript" src="' + item + '"><\/script>');
         });
+
+        window.requireTimeourError = function(){
+            var reqerr;
+
+            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;
+        };
     </script>
     <!-- application -->
     <script data-main="app_dev" src="../../../vendor/requirejs/require.js"></script>
diff --git a/apps/documenteditor/main/index.html.deploy b/apps/documenteditor/main/index.html.deploy
index 6a2e70bef..861c557f8 100644
--- a/apps/documenteditor/main/index.html.deploy
+++ b/apps/documenteditor/main/index.html.deploy
@@ -9,7 +9,7 @@
     <link rel="icon" href="resources/img/favicon.ico" type="image/x-icon" />
     <link rel="stylesheet" type="text/css" href="../../../apps/documenteditor/main/resources/css/app.css">
 
-    <!-- splash -->        
+    <!-- splash -->
 
     <style type="text/css">
         .loadmask {
@@ -254,8 +254,28 @@
                 '</div>' +
             '</div>');
 
-        var require = { 
-            waitSeconds: 30 
+        window.requireTimeourError = function(){
+            var reqerr;
+
+            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;
+        };
+
+        var requireTimeoutID = setTimeout(function(){
+            window.alert(window.requireTimeourError());
+            window.location.reload();
+        }, 30000);
+
+        var require = {
+            waitSeconds: 30,
+            callback: function(){
+                clearTimeout(requireTimeoutID);
+            }
         };
     </script>
 
diff --git a/apps/documenteditor/mobile/app-dev.js b/apps/documenteditor/mobile/app-dev.js
index bc204844a..e4fc202b3 100644
--- a/apps/documenteditor/mobile/app-dev.js
+++ b/apps/documenteditor/mobile/app-dev.js
@@ -218,37 +218,8 @@ require([
         app.start();
     });
 }, function(err) {
-    if (err.requireType == 'timeout' && !reqerr) {
-        var getUrlParams = function() {
-            var e,
-                a = /\+/g,  // Regex for replacing addition symbol with a space
-                r = /([^&=]+)=?([^&]*)/g,
-                d = function (s) { return decodeURIComponent(s.replace(a, " ")); },
-                q = window.location.search.substring(1),
-                urlParams = {};
-
-            while (e = r.exec(q))
-                urlParams[d(e[1])] = d(e[2]);
-
-            return urlParams;
-        };
-
-        var encodeUrlParam = function(str) {
-            return str.replace(/&/g, '&amp;')
-                .replace(/"/g, '&quot;')
-                .replace(/'/g, '&#39;')
-                .replace(/</g, '&lt;')
-                .replace(/>/g, '&gt;');
-        };
-
-        var lang = (getUrlParams()["lang"] || 'en').split("-")[0];
-
-        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.';
-
+    if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) {
+        reqerr = window.requireTimeourError();
         window.alert(reqerr);
         window.location.reload();
     }
diff --git a/apps/documenteditor/mobile/app.js b/apps/documenteditor/mobile/app.js
index 9f6b018a8..0544720d7 100644
--- a/apps/documenteditor/mobile/app.js
+++ b/apps/documenteditor/mobile/app.js
@@ -228,37 +228,8 @@ require([
         app.start();
     });
 }, function(err) {
-    if (err.requireType == 'timeout' && !reqerr) {
-        var getUrlParams = function() {
-            var e,
-                a = /\+/g,  // Regex for replacing addition symbol with a space
-                r = /([^&=]+)=?([^&]*)/g,
-                d = function (s) { return decodeURIComponent(s.replace(a, " ")); },
-                q = window.location.search.substring(1),
-                urlParams = {};
-
-            while (e = r.exec(q))
-                urlParams[d(e[1])] = d(e[2]);
-
-            return urlParams;
-        };
-
-        var encodeUrlParam = function(str) {
-            return str.replace(/&/g, '&amp;')
-                .replace(/"/g, '&quot;')
-                .replace(/'/g, '&#39;')
-                .replace(/</g, '&lt;')
-                .replace(/>/g, '&gt;');
-        };
-
-        var lang = (getUrlParams()["lang"] || 'en').split("-")[0];
-
-        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.';
-
+    if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) {
+        reqerr = window.requireTimeourError();
         window.alert(reqerr);
         window.location.reload();
     }
diff --git a/apps/documenteditor/mobile/index.html b/apps/documenteditor/mobile/index.html
index 11fd4a8a1..38c2e488f 100644
--- a/apps/documenteditor/mobile/index.html
+++ b/apps/documenteditor/mobile/index.html
@@ -249,6 +249,18 @@
             window.sdk_dev_scrpipts.forEach(function(item){
                 document.write('<script type="text/javascript" src="' + item + '"><\/script>');
             });
+
+            window.requireTimeourError = function(){
+                var reqerr;
+
+                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;
+            };
         </script>
         <!-- application -->
         <script data-main="app-dev" src="../../../vendor/requirejs/require.js"></script>
diff --git a/apps/documenteditor/mobile/index.html.deploy b/apps/documenteditor/mobile/index.html.deploy
index 393febbad..dd7879ed1 100644
--- a/apps/documenteditor/mobile/index.html.deploy
+++ b/apps/documenteditor/mobile/index.html.deploy
@@ -236,6 +236,30 @@
                     '<div class="loader-page-text-loading">' + loading + '</div>' +
                     '</div>' +
                 '</div>');
+
+            window.requireTimeourError = function(){
+                var reqerr;
+
+                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;
+            };
+
+            var requireTimeoutID = setTimeout(function(){
+                window.alert(window.requireTimeourError());
+                window.location.reload();
+            }, 30000);
+
+            var require = {
+                waitSeconds: 30,
+                callback: function(){
+                    clearTimeout(requireTimeoutID);
+                }
+            };
         </script>
 
         <div id="viewport"></div>
diff --git a/apps/presentationeditor/main/app.js b/apps/presentationeditor/main/app.js
index 3a3f9a384..0cb25efb3 100644
--- a/apps/presentationeditor/main/app.js
+++ b/apps/presentationeditor/main/app.js
@@ -189,37 +189,8 @@ require([
         app.start();
     });
 }, function(err) {
-    if (err.requireType == 'timeout' && !reqerr) {
-        var getUrlParams = function() {
-            var e,
-                a = /\+/g,  // Regex for replacing addition symbol with a space
-                r = /([^&=]+)=?([^&]*)/g,
-                d = function (s) { return decodeURIComponent(s.replace(a, " ")); },
-                q = window.location.search.substring(1),
-                urlParams = {};
-
-            while (e = r.exec(q))
-                urlParams[d(e[1])] = d(e[2]);
-
-            return urlParams;
-        };
-
-        var encodeUrlParam = function(str) {
-            return str.replace(/&/g, '&amp;')
-                    .replace(/"/g, '&quot;')
-                    .replace(/'/g, '&#39;')
-                    .replace(/</g, '&lt;')
-                    .replace(/>/g, '&gt;');
-        };
-
-        var lang = (getUrlParams()["lang"] || 'en').split("-")[0];
-
-        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.';
-
+    if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) {
+        reqerr = window.requireTimeourError();
         window.alert(reqerr);
         window.location.reload();
     }
diff --git a/apps/presentationeditor/main/app_dev.js b/apps/presentationeditor/main/app_dev.js
index bca5796fa..af1cdf9fa 100644
--- a/apps/presentationeditor/main/app_dev.js
+++ b/apps/presentationeditor/main/app_dev.js
@@ -181,37 +181,8 @@ require([
         app.start();
     });
 }, function(err) {
-    if (err.requireType == 'timeout' && !reqerr) {
-        var getUrlParams = function() {
-            var e,
-                a = /\+/g,  // Regex for replacing addition symbol with a space
-                r = /([^&=]+)=?([^&]*)/g,
-                d = function (s) { return decodeURIComponent(s.replace(a, " ")); },
-                q = window.location.search.substring(1),
-                urlParams = {};
-
-            while (e = r.exec(q))
-                urlParams[d(e[1])] = d(e[2]);
-
-            return urlParams;
-        };
-
-        var encodeUrlParam = function(str) {
-            return str.replace(/&/g, '&amp;')
-                    .replace(/"/g, '&quot;')
-                    .replace(/'/g, '&#39;')
-                    .replace(/</g, '&lt;')
-                    .replace(/>/g, '&gt;');
-        };
-
-        var lang = (getUrlParams()["lang"] || 'en').split("-")[0];
-
-        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.';
-
+    if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) {
+        reqerr = window.requireTimeourError();
         window.alert(reqerr);
         window.location.reload();
     }
diff --git a/apps/presentationeditor/main/index.html b/apps/presentationeditor/main/index.html
index b7fbec434..0f56b218c 100644
--- a/apps/presentationeditor/main/index.html
+++ b/apps/presentationeditor/main/index.html
@@ -275,6 +275,18 @@
         window.sdk_dev_scrpipts.forEach(function(item){
             document.write('<script type="text/javascript" src="' + item + '"><\/script>');
         });
+
+        window.requireTimeourError = function(){
+            var reqerr;
+
+            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;
+        };
     </script>
 
     <!-- application -->
diff --git a/apps/presentationeditor/main/index.html.deploy b/apps/presentationeditor/main/index.html.deploy
index 02842f74f..036a9d351 100644
--- a/apps/presentationeditor/main/index.html.deploy
+++ b/apps/presentationeditor/main/index.html.deploy
@@ -254,8 +254,28 @@
                 '</div>' +
             '</div>');
 
-        var require = { 
-            waitSeconds: 30 
+        window.requireTimeourError = function(){
+            var reqerr;
+
+            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;
+        };
+
+        var requireTimeoutID = setTimeout(function(){
+            window.alert(window.requireTimeourError());
+            window.location.reload();
+        }, 30000);
+
+        var require = {
+            waitSeconds: 30,
+            callback: function(){
+                clearTimeout(requireTimeoutID);
+            }
         };
     </script>
 
diff --git a/apps/presentationeditor/mobile/app-dev.js b/apps/presentationeditor/mobile/app-dev.js
index 022594cbb..6da7e7c12 100644
--- a/apps/presentationeditor/mobile/app-dev.js
+++ b/apps/presentationeditor/mobile/app-dev.js
@@ -221,37 +221,8 @@ require([
         app.start();
     });
 }, function(err) {
-    if (err.requireType == 'timeout' && !reqerr) {
-        var getUrlParams = function() {
-            var e,
-                a = /\+/g,  // Regex for replacing addition symbol with a space
-                r = /([^&=]+)=?([^&]*)/g,
-                d = function (s) { return decodeURIComponent(s.replace(a, " ")); },
-                q = window.location.search.substring(1),
-                urlParams = {};
-
-            while (e = r.exec(q))
-                urlParams[d(e[1])] = d(e[2]);
-
-            return urlParams;
-        };
-
-        var encodeUrlParam = function(str) {
-            return str.replace(/&/g, '&amp;')
-                .replace(/"/g, '&quot;')
-                .replace(/'/g, '&#39;')
-                .replace(/</g, '&lt;')
-                .replace(/>/g, '&gt;');
-        };
-
-        var lang = (getUrlParams()["lang"] || 'en').split("-")[0];
-
-        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.';
-
+    if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) {
+        reqerr = window.requireTimeourError();
         window.alert(reqerr);
         window.location.reload();
     }
diff --git a/apps/presentationeditor/mobile/app.js b/apps/presentationeditor/mobile/app.js
index b7c7d32ee..8cecad6f4 100644
--- a/apps/presentationeditor/mobile/app.js
+++ b/apps/presentationeditor/mobile/app.js
@@ -230,37 +230,8 @@ require([
         app.start();
     });
 }, function(err) {
-    if (err.requireType == 'timeout' && !reqerr) {
-        var getUrlParams = function() {
-            var e,
-                a = /\+/g,  // Regex for replacing addition symbol with a space
-                r = /([^&=]+)=?([^&]*)/g,
-                d = function (s) { return decodeURIComponent(s.replace(a, " ")); },
-                q = window.location.search.substring(1),
-                urlParams = {};
-
-            while (e = r.exec(q))
-                urlParams[d(e[1])] = d(e[2]);
-
-            return urlParams;
-        };
-
-        var encodeUrlParam = function(str) {
-            return str.replace(/&/g, '&amp;')
-                .replace(/"/g, '&quot;')
-                .replace(/'/g, '&#39;')
-                .replace(/</g, '&lt;')
-                .replace(/>/g, '&gt;');
-        };
-
-        var lang = (getUrlParams()["lang"] || 'en').split("-")[0];
-
-        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.';
-
+    if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) {
+        reqerr = window.requireTimeourError();
         window.alert(reqerr);
         window.location.reload();
     }
diff --git a/apps/presentationeditor/mobile/index.html b/apps/presentationeditor/mobile/index.html
index 9b53cb187..a9ea1b6e2 100644
--- a/apps/presentationeditor/mobile/index.html
+++ b/apps/presentationeditor/mobile/index.html
@@ -249,6 +249,18 @@
             window.sdk_dev_scrpipts.forEach(function(item){
                 document.write('<script type="text/javascript" src="' + item + '"><\/script>');
             });
+
+            window.requireTimeourError = function(){
+                var reqerr;
+
+                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;
+            };
         </script>
         <!-- application -->
         <script data-main="app-dev" src="../../../vendor/requirejs/require.js"></script>
diff --git a/apps/presentationeditor/mobile/index.html.deploy b/apps/presentationeditor/mobile/index.html.deploy
index 393febbad..dd7879ed1 100644
--- a/apps/presentationeditor/mobile/index.html.deploy
+++ b/apps/presentationeditor/mobile/index.html.deploy
@@ -236,6 +236,30 @@
                     '<div class="loader-page-text-loading">' + loading + '</div>' +
                     '</div>' +
                 '</div>');
+
+            window.requireTimeourError = function(){
+                var reqerr;
+
+                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;
+            };
+
+            var requireTimeoutID = setTimeout(function(){
+                window.alert(window.requireTimeourError());
+                window.location.reload();
+            }, 30000);
+
+            var require = {
+                waitSeconds: 30,
+                callback: function(){
+                    clearTimeout(requireTimeoutID);
+                }
+            };
         </script>
 
         <div id="viewport"></div>
diff --git a/apps/spreadsheeteditor/main/app.js b/apps/spreadsheeteditor/main/app.js
index 7ef127121..7fc483dd9 100644
--- a/apps/spreadsheeteditor/main/app.js
+++ b/apps/spreadsheeteditor/main/app.js
@@ -186,37 +186,8 @@ require([
         app.start();
     });
 }, function(err) {
-    if (err.requireType == 'timeout' && !reqerr) {
-        var getUrlParams = function() {
-            var e,
-                a = /\+/g,  // Regex for replacing addition symbol with a space
-                r = /([^&=]+)=?([^&]*)/g,
-                d = function (s) { return decodeURIComponent(s.replace(a, " ")); },
-                q = window.location.search.substring(1),
-                urlParams = {};
-
-            while (e = r.exec(q))
-                urlParams[d(e[1])] = d(e[2]);
-
-            return urlParams;
-        };
-
-        var encodeUrlParam = function(str) {
-            return str.replace(/&/g, '&amp;')
-                    .replace(/"/g, '&quot;')
-                    .replace(/'/g, '&#39;')
-                    .replace(/</g, '&lt;')
-                    .replace(/>/g, '&gt;');
-        };
-
-        var lang = (getUrlParams()["lang"] || 'en').split("-")[0];
-
-        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.';
-
+    if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) {
+        reqerr = window.requireTimeourError();
         window.alert(reqerr);
         window.location.reload();
     }
diff --git a/apps/spreadsheeteditor/main/app_dev.js b/apps/spreadsheeteditor/main/app_dev.js
index 1cc730a2d..718a890e6 100644
--- a/apps/spreadsheeteditor/main/app_dev.js
+++ b/apps/spreadsheeteditor/main/app_dev.js
@@ -177,37 +177,8 @@ require([
         app.start();
     });
 }, function(err) {
-    if (err.requireType == 'timeout' && !reqerr) {
-        var getUrlParams = function() {
-            var e,
-                a = /\+/g,  // Regex for replacing addition symbol with a space
-                r = /([^&=]+)=?([^&]*)/g,
-                d = function (s) { return decodeURIComponent(s.replace(a, " ")); },
-                q = window.location.search.substring(1),
-                urlParams = {};
-
-            while (e = r.exec(q))
-                urlParams[d(e[1])] = d(e[2]);
-
-            return urlParams;
-        };
-
-        var encodeUrlParam = function(str) {
-            return str.replace(/&/g, '&amp;')
-                    .replace(/"/g, '&quot;')
-                    .replace(/'/g, '&#39;')
-                    .replace(/</g, '&lt;')
-                    .replace(/>/g, '&gt;');
-        };
-
-        var lang = (getUrlParams()["lang"] || 'en').split("-")[0];
-
-        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.';
-
+    if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) {
+        reqerr = window.requireTimeourError();
         window.alert(reqerr);
         window.location.reload();
     }
diff --git a/apps/spreadsheeteditor/main/index.html b/apps/spreadsheeteditor/main/index.html
index 44bd96271..8a183adad 100644
--- a/apps/spreadsheeteditor/main/index.html
+++ b/apps/spreadsheeteditor/main/index.html
@@ -277,6 +277,18 @@
         window.sdk_dev_scrpipts.forEach(function(item){
             document.write('<script type="text/javascript" src="' + item + '"><\/script>');
         });
+
+        window.requireTimeourError = function(){
+            var reqerr;
+
+            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;
+        };
     </script>
 
     <!-- application -->
diff --git a/apps/spreadsheeteditor/main/index.html.deploy b/apps/spreadsheeteditor/main/index.html.deploy
index a6e3b81b3..53e709d7a 100644
--- a/apps/spreadsheeteditor/main/index.html.deploy
+++ b/apps/spreadsheeteditor/main/index.html.deploy
@@ -255,8 +255,28 @@
                 '</div>' +
             '</div>');
 
-        var require = { 
-            waitSeconds: 30 
+        window.requireTimeourError = function(){
+            var reqerr;
+
+            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;
+        };
+
+        var requireTimeoutID = setTimeout(function(){
+            window.alert(window.requireTimeourError());
+            window.location.reload();
+        }, 30000);
+
+        var require = {
+            waitSeconds: 30,
+            callback: function(){
+                clearTimeout(requireTimeoutID);
+            }
         };
     </script>
 
diff --git a/apps/spreadsheeteditor/mobile/app-dev.js b/apps/spreadsheeteditor/mobile/app-dev.js
index ead495523..170510328 100644
--- a/apps/spreadsheeteditor/mobile/app-dev.js
+++ b/apps/spreadsheeteditor/mobile/app-dev.js
@@ -204,37 +204,8 @@ require([
         app.start();
     });
 }, function(err) {
-    if (err.requireType == 'timeout' && !reqerr) {
-        var getUrlParams = function() {
-            var e,
-                a = /\+/g,  // Regex for replacing addition symbol with a space
-                r = /([^&=]+)=?([^&]*)/g,
-                d = function (s) { return decodeURIComponent(s.replace(a, " ")); },
-                q = window.location.search.substring(1),
-                urlParams = {};
-
-            while (e = r.exec(q))
-                urlParams[d(e[1])] = d(e[2]);
-
-            return urlParams;
-        };
-
-        var encodeUrlParam = function(str) {
-            return str.replace(/&/g, '&amp;')
-                .replace(/"/g, '&quot;')
-                .replace(/'/g, '&#39;')
-                .replace(/</g, '&lt;')
-                .replace(/>/g, '&gt;');
-        };
-
-        var lang = (getUrlParams()["lang"] || 'en').split("-")[0];
-
-        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.';
-
+    if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) {
+        reqerr = window.requireTimeourError();
         window.alert(reqerr);
         window.location.reload();
     }
diff --git a/apps/spreadsheeteditor/mobile/app.js b/apps/spreadsheeteditor/mobile/app.js
index fd4cd8d79..9624d4cca 100644
--- a/apps/spreadsheeteditor/mobile/app.js
+++ b/apps/spreadsheeteditor/mobile/app.js
@@ -214,37 +214,8 @@ require([
         app.start();
     });
 }, function(err) {
-    if (err.requireType == 'timeout' && !reqerr) {
-        var getUrlParams = function() {
-            var e,
-                a = /\+/g,  // Regex for replacing addition symbol with a space
-                r = /([^&=]+)=?([^&]*)/g,
-                d = function (s) { return decodeURIComponent(s.replace(a, " ")); },
-                q = window.location.search.substring(1),
-                urlParams = {};
-
-            while (e = r.exec(q))
-                urlParams[d(e[1])] = d(e[2]);
-
-            return urlParams;
-        };
-
-        var encodeUrlParam = function(str) {
-            return str.replace(/&/g, '&amp;')
-                .replace(/"/g, '&quot;')
-                .replace(/'/g, '&#39;')
-                .replace(/</g, '&lt;')
-                .replace(/>/g, '&gt;');
-        };
-
-        var lang = (getUrlParams()["lang"] || 'en').split("-")[0];
-
-        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.';
-
+    if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) {
+        reqerr = window.requireTimeourError();
         window.alert(reqerr);
         window.location.reload();
     }
diff --git a/apps/spreadsheeteditor/mobile/index.html b/apps/spreadsheeteditor/mobile/index.html
index 102b234c4..52dac4b0a 100644
--- a/apps/spreadsheeteditor/mobile/index.html
+++ b/apps/spreadsheeteditor/mobile/index.html
@@ -250,6 +250,18 @@
             window.sdk_dev_scrpipts.forEach(function(item){
                 document.write('<script type="text/javascript" src="' + item + '"><\/script>');
             });
+
+            window.requireTimeourError = function(){
+                var reqerr;
+
+                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;
+            };
         </script>
         <!-- application -->
         <script data-main="app-dev" src="../../../vendor/requirejs/require.js"></script>
diff --git a/apps/spreadsheeteditor/mobile/index.html.deploy b/apps/spreadsheeteditor/mobile/index.html.deploy
index a20596f96..1f9c6dfad 100644
--- a/apps/spreadsheeteditor/mobile/index.html.deploy
+++ b/apps/spreadsheeteditor/mobile/index.html.deploy
@@ -235,6 +235,30 @@
                     '<div class="loader-page-text-loading">' + loading + '</div>' +
                     '</div>' +
                 '</div>');
+
+            window.requireTimeourError = function(){
+                var reqerr;
+
+                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;
+            };
+
+            var requireTimeoutID = setTimeout(function(){
+                window.alert(window.requireTimeourError());
+                window.location.reload();
+            }, 30000);
+
+            var require = {
+                waitSeconds: 30,
+                callback: function(){
+                    clearTimeout(requireTimeoutID);
+                }
+            };
         </script>
 
         <div id="viewport"></div>