Merge pull request 'feature/load-scripts-not-in-popup' from feature/load-scripts-not-in-popup into develop

Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/66

CHANGELOG.md

@@ -1,5 +1,6 @@
 # Change Log
 
+- preload frame moved from uploading popap
 - change tab title on rename
 - change uploaded file name in popap if converted
 - php-laravel: fix custom jwt header

web/documentserver-example/csharp-mvc/Content/stylesheet.css

@@ -511,10 +511,6 @@ label .checkbox {
     line-height: 150%;
 }
 
-#loadScripts {
-    display: none;
-}
-
 #iframeScripts {
     position: absolute;
     visibility: hidden;

web/documentserver-example/csharp-mvc/Scripts/jscript.js

@@ -126,7 +126,7 @@ if (typeof jQuery != "undefined") {
 
         if (!formatManager.isAutoConvertible(posExt)) {
             jq("#step2").addClass("done").removeClass("current");
-            loadScripts();
+            onuploaded();
             return;
         }
 
@@ -184,35 +184,14 @@ if (typeof jQuery != "undefined") {
                     } else {
                         jq("#uploadFileName").text(response.filename);
                         jq("#step2").addClass("done").removeClass("current");
-                        loadScripts();
+                        onuploaded();
                     }
                 }
             });
         }, 1000);
     };
 
-    var loadScripts = function () {
+    var onuploaded = function () {
-        if (!jq("#mainProgress").is(":visible")) {
-            return;
-        }
-        jq("#step3").addClass("current");
-
-        if (jq("#loadScripts").is(":empty")) {
-            var urlScripts = jq("#loadScripts").attr("data-docs");
-            var frame = '<iframe id="iframeScripts" width=1 height=1 style="position: absolute; visibility: hidden;" ></iframe>';
-            jq("#loadScripts").html(frame);
-            document.getElementById("iframeScripts").onload = onloadScripts;
-            jq("#loadScripts iframe").attr("src", urlScripts);
-        } else {
-            onloadScripts();
-        }
-    };
-
-    var onloadScripts = function () {
-        if (!jq("#mainProgress").is(":visible")) {
-            return;
-        }
-        jq("#step3").addClass("done").removeClass("current");
         jq("#beginView, #beginEmbedded").removeClass("disable");
 
         var fileName = jq("#hiddenFileName").val();
@@ -274,7 +253,7 @@ if (typeof jQuery != "undefined") {
 
     jq(document).on("click", "#skipPass", function () {
         jq("#blockPassword").hide();
-        loadScripts();
+        onuploaded();
     });
 
     jq(document).on("click", "#beginEdit:not(.disable)", function () {

web/documentserver-example/csharp-mvc/Views/Home/Index.aspx

@@ -362,10 +362,7 @@
                 <span class="errorPass"></span>
                 <br />
             </div>
-            <span id="step3" class="step">3. Loading editor scripts.</span>
-            <span class="step-descr">They are loaded only once, they will be cached on your computer.</span>
             <input type="hidden" name="hiddenFileName" id="hiddenFileName" />
-            <br />
             <span class="progress-descr">Note the speed of all operations depends on your connection quality and server location.</span>
             <br />
             <div class="error-message">
@@ -410,7 +407,7 @@
         </div>
     </div>
 
-    <span id="loadScripts" data-docs="<%= WebConfigurationManager.AppSettings["files.docservice.url.site"] + WebConfigurationManager.AppSettings["files.docservice.url.preloader"] %>"></span>
+    <iframe id="iframeScripts" src="<%= WebConfigurationManager.AppSettings["files.docservice.url.site"] + WebConfigurationManager.AppSettings["files.docservice.url.preloader"] %>" width=1 height=1 style="position: absolute; visibility: hidden; top: 0;" ></iframe>
 
     <footer>
         <div class="center">

web/documentserver-example/csharp/App_Themes/stylesheet.css

@@ -511,10 +511,6 @@ label .checkbox {
     line-height: 150%;
 }
 
-#loadScripts {
-    display: none;
-}
-
 #iframeScripts {
     position: absolute;
     visibility: hidden;

web/documentserver-example/csharp/Default.aspx

@@ -364,10 +364,7 @@
                     <span class="errorPass"></span>
                     <br />
                 </div>
-                <span id="step3" class="step">3. Loading editor scripts.</span>
-                <span class="step-descr">They are loaded only once, they will be cached on your computer.</span>
                 <input type="hidden" name="hiddenFileName" id="hiddenFileName" />
-                <br />
                 <span class="progress-descr">Note the speed of all operations depends on your connection quality and server location.</span>
                 <br />
                 <div class="error-message">
@@ -412,7 +409,7 @@
         </div>
     </div>
 
-        <span id="loadScripts" data-docs="<%= UrlPreloadScripts %>"></span>
+        <iframe id="iframeScripts" src="<%= UrlPreloadScripts %>" width=1 height=1 style="position: absolute; visibility: hidden; top: 0;" ></iframe>
 
         <footer>
             <div class="center">

web/documentserver-example/csharp/script/jscript.js

@@ -126,7 +126,7 @@ if (typeof jQuery != "undefined") {
 
         if (!formatManager.isAutoConvertible(posExt)) {
             jq("#step2").addClass("done").removeClass("current");
-            loadScripts();
+            onuploaded();
             return;
         }
 
@@ -184,35 +184,14 @@ if (typeof jQuery != "undefined") {
                     } else {
                         jq("#uploadFileName").text(response.filename);
                         jq("#step2").addClass("done").removeClass("current");
-                        loadScripts();
+                        onuploaded();
                     }
                 }
             });
         }, 1000);
     };
 
-    var loadScripts = function () {
+    var onuploaded = function () {
-        if (!jq("#mainProgress").is(":visible")) {
-            return;
-        }
-        jq("#step3").addClass("current");
-
-        if (jq("#loadScripts").is(":empty")) {
-            var urlScripts = jq("#loadScripts").attr("data-docs");
-            var frame = '<iframe id="iframeScripts" width=1 height=1 style="position: absolute; visibility: hidden;" ></iframe>';
-            jq("#loadScripts").html(frame);
-            document.getElementById("iframeScripts").onload = onloadScripts;
-            jq("#loadScripts iframe").attr("src", urlScripts);
-        } else {
-            onloadScripts();
-        }
-    };
-
-    var onloadScripts = function () {
-        if (!jq("#mainProgress").is(":visible")) {
-            return;
-        }
-        jq("#step3").addClass("done").removeClass("current");
         jq("#beginView, #beginEmbedded").removeClass("disable");
 
         var fileName = jq("#hiddenFileName").val();
@@ -274,7 +253,7 @@ if (typeof jQuery != "undefined") {
 
     jq(document).on("click", "#skipPass", function () {
         jq("#blockPassword").hide();
-        loadScripts();
+        onuploaded();
     });
 
     jq(document).on("click", "#beginEdit:not(.disable)", function () {

web/documentserver-example/go/static/javascripts/jscript.js

@@ -114,7 +114,7 @@ if (typeof jQuery !== "undefined") {
 
         if (!formatManager.isAutoConvertible(posExt)) {
             jq("#step2").addClass("done").removeClass("current");
-            loadScripts();
+            onuploaded();
             return;
         }
 
@@ -171,35 +171,14 @@ if (typeof jQuery !== "undefined") {
                     } else {
                         jq("#uploadFileName").text(response.filename);
                         jq("#step2").addClass("done").removeClass("current");
-                        loadScripts();
+                        onuploaded();
                     }
                 }
             });
         }, 1000);
     };
 
-    var loadScripts = function () {
+    var onuploaded = function () {
-        if (!jq("#mainProgress").is(":visible")) {
-            return;
-        }
-        jq("#step3").addClass("current");
-
-        if (jq("#loadScripts").is(":empty")) {
-            var urlScripts = jq("#loadScripts").attr("data-docs");
-            var frame = "<iframe id=\"iframeScripts\" width=1 height=1 style=\"position: absolute; visibility: hidden;\" ></iframe>";
-            jq("#loadScripts").html(frame);
-            document.getElementById("iframeScripts").onload = onloadScripts;
-            jq("#loadScripts iframe").attr("src", urlScripts);
-        } else {
-            onloadScripts();
-        }
-    };
-
-    var onloadScripts = function () {
-        if (!jq("#mainProgress").is(":visible")) {
-            return;
-        }
-        jq("#step3").addClass("done").removeClass("current");
         jq("#beginView, #beginEmbedded").removeClass("disable");
 
         var fileName = jq("#hiddenFileName").val();
@@ -261,7 +240,7 @@ if (typeof jQuery !== "undefined") {
 
     jq(document).on("click", "#skipPass", function () {
         jq("#blockPassword").hide();
-        loadScripts();
+        onuploaded();
     });
 
     jq(document).on("click", "#beginEdit:not(.disable)", function () {

web/documentserver-example/go/static/stylesheets/stylesheet.css

@@ -511,10 +511,6 @@ label .checkbox {
     line-height: 150%;
 }
 
-#loadScripts {
-    display: none;
-}
-
 #iframeScripts {
     position: absolute;
     visibility: hidden;

web/documentserver-example/go/templates/index.html

@@ -341,10 +341,7 @@
                 <span class="errorPass"></span>
                 <br />
             </div>
-            <span id="step3" class="step">3. Loading editor scripts.</span>
-            <span class="step-descr">They are loaded only once, they will be cached on your computer.</span>
             <input type="hidden" name="hiddenFileName" id="hiddenFileName" />
-            <br />
             <span class="progress-descr">Note the speed of all operations depends on your connection quality and server location.</span>
             <br />
             <div class="error-message">
@@ -388,7 +385,7 @@
         </div>
     </div>
 
-    <span id="loadScripts" data-docs="{{ .Preloader }}"></span>
+    <iframe id="iframeScripts" src="{{ .Preloader }}" width=1 height=1 style="position: absolute; visibility: hidden; top: 0;" ></iframe>
 
     <footer>
         <div class="center">

web/documentserver-example/java-spring/src/main/resources/static/css/stylesheet.css

@@ -511,10 +511,6 @@ label .checkbox {
     line-height: 150%;
 }
 
-#loadScripts {
-    display: none;
-}
-
 #iframeScripts {
     position: absolute;
     visibility: hidden;

web/documentserver-example/java-spring/src/main/resources/static/scripts/jscript.js

@@ -114,7 +114,7 @@ if (typeof jQuery !== "undefined") {
 
         if (!formatManager.isAutoConvertible(posExt)) {
             jq("#step2").addClass("done").removeClass("current");
-            loadScripts();
+            onuploaded();
             return;
         }
 
@@ -170,35 +170,14 @@ if (typeof jQuery !== "undefined") {
                         jq("#hiddenFileName").val(response.filename);
                         jq("#uploadFileName").text(response.filename);
                         jq("#step2").addClass("done").removeClass("current");
-                        loadScripts();
+                        onuploaded();
                     }
                 }
             });
         }, 1000);
     };
 
-    var loadScripts = function () {
+    var onuploaded = function () {
-        if (!jq("#mainProgress").is(":visible")) {
-            return;
-        }
-        jq("#step3").addClass("current");
-
-        if (jq("#loadScripts").is(":empty")) {
-            var urlScripts = jq("#loadScripts").attr("data-docs");
-            var frame = "<iframe id=\"iframeScripts\" width=1 height=1 style=\"position: absolute; visibility: hidden;\" ></iframe>";
-            jq("#loadScripts").html(frame);
-            document.getElementById("iframeScripts").onload = onloadScripts;
-            jq("#loadScripts iframe").attr("src", urlScripts);
-        } else {
-            onloadScripts();
-        }
-    };
-
-    var onloadScripts = function () {
-        if (!jq("#mainProgress").is(":visible")) {
-            return;
-        }
-        jq("#step3").addClass("done").removeClass("current");
         jq("#beginView, #beginEmbedded").removeClass("disable");
 
         var fileName = jq("#hiddenFileName").val();
@@ -266,7 +245,7 @@ if (typeof jQuery !== "undefined") {
 
     jq(document).on("click", "#skipPass", function () {
         jq("#blockPassword").hide();
-        loadScripts();
+        onuploaded();
     });
 
     jq(document).on("click", "#beginEdit:not(.disable)", function () {

web/documentserver-example/java-spring/src/main/resources/templates/index.html

@@ -327,10 +327,7 @@
                 <span class="errorPass"></span>
                 <br />
             </div>
-            <span id="step3" class="step">3. Loading editor scripts.</span>
-            <span class="step-descr">They are loaded only once, they will be cached on your computer.</span>
             <input type="hidden" name="hiddenFileName" id="hiddenFileName" />
-            <br />
             <span class="progress-descr">Note the speed of all operations depends on your connection quality and server location.</span>
             <br />
             <div class="error-message">
@@ -375,7 +372,7 @@
         </div>
     </div>
 
-    <span id="loadScripts" th:attr="data-docs=${datadocs}"></span>
+    <iframe id="iframeScripts" th:attr="src=${datadocs}" width=1 height=1 style="position: absolute; visibility: hidden; top: 0;" ></iframe>
 
     <footer>
         <div class="center">

web/documentserver-example/java/src/main/webapp/css/stylesheet.css

@@ -511,10 +511,6 @@ label .checkbox {
     line-height: 150%;
 }
 
-#loadScripts {
-    display: none;
-}
-
 #iframeScripts {
     position: absolute;
     visibility: hidden;

web/documentserver-example/java/src/main/webapp/index.jsp

@@ -366,10 +366,7 @@
                     <span class="errorPass"></span>
                     <br />
                 </div>
-                <span id="step3" class="step">3. Loading editor scripts.</span>
-                <span class="step-descr">They are loaded only once, they will be cached on your computer.</span>
                 <input type="hidden" name="hiddenFileName" id="hiddenFileName" />
-                <br />
                 <span class="progress-descr">Note the speed of all operations depends on your connection quality and server location.</span>
                 <br />
                 <div class="error-message">
@@ -414,7 +411,7 @@
             </div>
         </div>
 
-        <span id="loadScripts" data-docs="<%= ConfigManager.getProperty("files.docservice.url.site") + ConfigManager.getProperty("files.docservice.url.preloader") %>"></span>
+        <iframe id="iframeScripts" src="<%= ConfigManager.getProperty("files.docservice.url.site") + ConfigManager.getProperty("files.docservice.url.preloader") %>" width=1 height=1 style="position: absolute; visibility: hidden; top: 0;" ></iframe>
 
         <footer>
             <div class="center">

web/documentserver-example/java/src/main/webapp/scripts/jscript.js

@@ -126,7 +126,7 @@ if (typeof jQuery !== "undefined") {
 
         if (!formatManager.isAutoConvertible(posExt)) {
             jq("#step2").addClass("done").removeClass("current");
-            loadScripts();
+            onuploaded();
             return;
         }
 
@@ -183,35 +183,14 @@ if (typeof jQuery !== "undefined") {
                     } else {
                         jq("#uploadFileName").text(response.filename);
                         jq("#step2").addClass("done").removeClass("current");
-                        loadScripts();
+                        onuploaded();
                     }
                 }
             });
         }, 1000);
     };
 
-    var loadScripts = function () {
+    var onuploaded = function () {
-        if (!jq("#mainProgress").is(":visible")) {
-            return;
-        }
-        jq("#step3").addClass("current");
-
-        if (jq("#loadScripts").is(":empty")) {
-            var urlScripts = jq("#loadScripts").attr("data-docs");
-            var frame = "<iframe id=\"iframeScripts\" width=1 height=1 style=\"position: absolute; visibility: hidden;\" ></iframe>";
-            jq("#loadScripts").html(frame);
-            document.getElementById("iframeScripts").onload = onloadScripts;
-            jq("#loadScripts iframe").attr("src", urlScripts);
-        } else {
-            onloadScripts();
-        }
-    };
-
-    var onloadScripts = function () {
-        if (!jq("#mainProgress").is(":visible")) {
-            return;
-        }
-        jq("#step3").addClass("done").removeClass("current");
         jq("#beginView, #beginEmbedded").removeClass("disable");
 
         var fileName = jq("#hiddenFileName").val();
@@ -273,7 +252,7 @@ if (typeof jQuery !== "undefined") {
 
     jq(document).on("click", "#skipPass", function () {
         jq("#blockPassword").hide();
-        loadScripts();
+        onuploaded();
     });
 
     jq(document).on("click", "#beginEdit:not(.disable)", function () {

web/documentserver-example/php-laravel/public/css/app.css

@@ -502,10 +502,6 @@ label .checkbox {
     line-height: 150%;
 }
 
-#loadScripts {
-    display: none;
-}
-
 #iframeScripts {
     position: absolute;
     visibility: hidden;

web/documentserver-example/php-laravel/resources/js/app.js

@@ -143,12 +143,12 @@ if (typeof jQuery != "undefined") {
 
         if (!formatManager.isAutoConvertible(posExt)) {
             jq("#step2").addClass("done").removeClass("current");
-            loadScripts();
+            onuploaded();
             return;
         }
 
         if (jq("#checkOriginalFormat").is(":checked")) {
-            loadScripts();
+            onuploaded();
             return;
         }
         jq("#step2").addClass("current");
@@ -215,35 +215,14 @@ if (typeof jQuery != "undefined") {
                     } else {
                         jq("#uploadFileName").text(response.filename);
                         jq("#step2").addClass("done").removeClass("current");
-                        loadScripts();
+                        onuploaded();
                     }
                 }
             });
         }, 1000);
     };
 
-    var loadScripts = function () {
+    var onuploaded = function () {
-        if (!jq("#mainProgress").is(":visible")) {
-            return;
-        }
-        jq("#step3").addClass("current");
-
-        if (jq("#loadScripts").is(":empty")) {
-            var urlScripts = jq("#loadScripts").attr("data-docs");
-            var frame = '<iframe id="iframeScripts" width=1 height=1 style="position: absolute; visibility: hidden;" ></iframe>';
-            jq("#loadScripts").html(frame);
-            document.getElementById("iframeScripts").onload = onloadScripts;
-            jq("#loadScripts iframe").attr("src", urlScripts);
-        } else {
-            onloadScripts();
-        }
-    };
-
-    var onloadScripts = function () {
-        if (!jq("#mainProgress").is(":visible")) {
-            return;
-        }
-        jq("#step3").addClass("done").removeClass("current");
         jq("#beginView, #beginEmbedded").removeClass("disable");
 
         var fileName = jq("#hiddenFileName").val();
@@ -299,7 +278,7 @@ if (typeof jQuery != "undefined") {
 
     jq(document).on("click", "#skipPass", function () {
         jq("#blockPassword").hide();
-        loadScripts();
+        onuploaded();
     });
 
     jq(document).on("click", "#beginEdit:not(.disable)", function () {

web/documentserver-example/php-laravel/resources/views/index.blade.php

@@ -346,10 +346,7 @@
                     <span class="errorPass"></span>
                     <br />
                 </div>
-                <span id="step3" class="step">3. Loading editor scripts.</span>
-                <span class="step-descr">They are loaded only once, they will be cached on your computer.</span>
                 <input type="hidden" name="hiddenFileName" id="hiddenFileName" />
-                <br />
                 <span class="progress-descr">Note the speed of all operations depends
                     on your connection quality and server location.</span>
                 <br />
@@ -395,7 +392,7 @@
             </div>
         </div>form>
 
-        <span id="loadScripts" data-docs="{{ $preloaderUrl }}"></span>
+        <iframe id="iframeScripts" src="{{ $preloaderUrl }}" width=1 height=1 style="position: absolute; visibility: hidden; top: 0;" ></iframe>
 
         <footer>
             <div class="center">

web/documentserver-example/php/assets/css/stylesheet.css

@@ -510,10 +510,6 @@ label .checkbox {
     line-height: 150%;
 }
 
-#loadScripts {
-    display: none;
-}
-
 #iframeScripts {
     position: absolute;
     visibility: hidden;

web/documentserver-example/php/assets/js/jscript.js

@@ -134,12 +134,12 @@ if (typeof jQuery != "undefined") {
 
         if (!formatManager.isAutoConvertible(posExt)) {
             jq("#step2").addClass("done").removeClass("current");
-            loadScripts();
+            onuploaded();
             return;
         }
 
         if (jq("#checkOriginalFormat").is(":checked")) {
-            loadScripts();
+            onuploaded();
             return;
         }
         jq("#step2").addClass("current");
@@ -205,35 +205,14 @@ if (typeof jQuery != "undefined") {
                     } else {
                         jq("#uploadFileName").text(response.filename);
                         jq("#step2").addClass("done").removeClass("current");
-                        loadScripts();
+                        onuploaded();
                     }
                 }
             });
         }, 1000);
     };
 
-    var loadScripts = function () {
+    var onuploaded = function () {
-        if (!jq("#mainProgress").is(":visible")) {
-            return;
-        }
-        jq("#step3").addClass("current");
-
-        if (jq("#loadScripts").is(":empty")) {
-            var urlScripts = jq("#loadScripts").attr("data-docs");
-            var frame = '<iframe id="iframeScripts" width=1 height=1 style="position: absolute; visibility: hidden;" ></iframe>';
-            jq("#loadScripts").html(frame);
-            document.getElementById("iframeScripts").onload = onloadScripts;
-            jq("#loadScripts iframe").attr("src", urlScripts);
-        } else {
-            onloadScripts();
-        }
-    };
-
-    var onloadScripts = function () {
-        if (!jq("#mainProgress").is(":visible")) {
-            return;
-        }
-        jq("#step3").addClass("done").removeClass("current");
         jq("#beginView, #beginEmbedded").removeClass("disable");
 
         var fileName = jq("#hiddenFileName").val();
@@ -289,7 +268,7 @@ if (typeof jQuery != "undefined") {
 
     jq(document).on("click", "#skipPass", function () {
         jq("#blockPassword").hide();
-        loadScripts();
+        onuploaded();
     });
 
     jq(document).on("click", "#beginEdit:not(.disable)", function () {

web/documentserver-example/php/templates/index.tpl

@@ -187,10 +187,7 @@
                 <span class="errorPass"></span>
                 <br />
             </div>
-            <span id="step3" class="step">3. Loading editor scripts.</span>
-            <span class="step-descr">They are loaded only once, they will be cached on your computer.</span>
             <input type="hidden" name="hiddenFileName" id="hiddenFileName" />
-            <br />
             <span class="progress-descr">Note the speed of all operations depends
                         on your connection quality and server location.</span>
             <br />
@@ -237,7 +234,7 @@
         </div>
     </div>
 
-    <span id="loadScripts" data-docs="{dataDocs}"></span>
+    <iframe id="iframeScripts" src="{dataDocs}" width=1 height=1 style="position: absolute; visibility: hidden; top: 0;" ></iframe>
 
     <footer>
         <div class="center">

web/documentserver-example/python/static/css/stylesheet.css

@@ -511,10 +511,6 @@ label .checkbox {
     line-height: 150%;
 }
 
-#loadScripts {
-    display: none;
-}
-
 #iframeScripts {
     position: absolute;
     visibility: hidden;

web/documentserver-example/python/static/js/jscript.js

@@ -126,7 +126,7 @@ if (typeof jQuery !== "undefined") {
 
         if (!formatManager.isAutoConvertible(posExt)) {
             jq("#step2").addClass("done").removeClass("current");
-            loadScripts();
+            onuploaded();
             return;
         }
 
@@ -183,35 +183,14 @@ if (typeof jQuery !== "undefined") {
                     } else {
                         jq("#uploadFileName").text(response.filename);
                         jq("#step2").addClass("done").removeClass("current");
-                        loadScripts();
+                        onuploaded();
                     }
                 }
             });
         }, 1000);
     };
 
-    var loadScripts = function () {
+    var onuploaded = function () {
-        if (!jq("#mainProgress").is(":visible")) {
-            return;
-        }
-        jq("#step3").addClass("current");
-
-        if (jq("#loadScripts").is(":empty")) {
-            var urlScripts = jq("#loadScripts").attr("data-docs");
-            var frame = "<iframe id=\"iframeScripts\" width=1 height=1 style=\"position: absolute; visibility: hidden;\" ></iframe>";
-            jq("#loadScripts").html(frame);
-            document.getElementById("iframeScripts").onload = onloadScripts;
-            jq("#loadScripts iframe").attr("src", urlScripts);
-        } else {
-            onloadScripts();
-        }
-    };
-
-    var onloadScripts = function () {
-        if (!jq("#mainProgress").is(":visible")) {
-            return;
-        }
-        jq("#step3").addClass("done").removeClass("current");
         jq("#beginView, #beginEmbedded").removeClass("disable");
 
         var fileName = jq("#hiddenFileName").val();
@@ -273,7 +252,7 @@ if (typeof jQuery !== "undefined") {
 
     jq(document).on("click", "#skipPass", function () {
         jq("#blockPassword").hide();
-        loadScripts();
+        onuploaded();
     });
 
     jq(document).on("click", "#beginEdit:not(.disable)", function () {

web/documentserver-example/python/templates/index.html

@@ -341,10 +341,7 @@
                 <span class="errorPass"></span>
                 <br />
             </div>
-            <span id="step3" class="step">3. Loading editor scripts.</span>
-            <span class="step-descr">They are loaded only once, they will be cached on your computer.</span>
             <input type="hidden" name="hiddenFileName" id="hiddenFileName" />
-            <br />
             <span class="progress-descr">Note the speed of all operations depends on your connection quality and server location.</span>
             <br />
             <div class="error-message">
@@ -388,7 +385,7 @@
         </div>
     </div>
 
-    <span id="loadScripts" data-docs="{{ preloadurl }}"></span>
+    <iframe id="iframeScripts" src="{{ preloadurl }}" width=1 height=1 style="position: absolute; visibility: hidden; top: 0;" ></iframe>
 
     <footer>
         <div class="center">

web/documentserver-example/ruby/app/assets/javascripts/jscript.js

@@ -137,7 +137,7 @@ if (typeof jQuery != "undefined") {
 
         if (!formatManager.isAutoConvertible(posExt)) {
             jq("#step2").addClass("done").removeClass("current");
-            loadScripts();
+            onuploaded();
             return;
         }
 
@@ -194,35 +194,14 @@ if (typeof jQuery != "undefined") {
                     } else {
                         jq("#uploadFileName").text(response.filename);
                         jq("#step2").addClass("done").removeClass("current");
-                        loadScripts();
+                        onuploaded();
                     }
                 }
             });
         }, 1000);
     };
 
-    var loadScripts = function () {
+    var onuploaded = function () {
-        if (!jq("#mainProgress").is(":visible")) {
-            return;
-        }
-        jq("#step3").addClass("current");
-
-        if (jq("#loadScripts").is(":empty")) {
-            var urlScripts = jq("#loadScripts").attr("data-docs");
-            var frame = '<iframe id="iframeScripts" width=1 height=1 style="position: absolute; visibility: hidden;" ></iframe>';
-            jq("#loadScripts").html(frame);
-            document.getElementById("iframeScripts").onload = onloadScripts;
-            jq("#loadScripts iframe").attr("src", urlScripts);
-        } else {
-            onloadScripts();
-        }
-    };
-
-    var onloadScripts = function () {
-        if (!jq("#mainProgress").is(":visible")) {
-            return;
-        }
-        jq("#step3").addClass("done").removeClass("current");
         jq("#beginView, #beginEmbedded").removeClass("disable");
 
         var fileName = jq("#hiddenFileName").val();
@@ -278,7 +257,7 @@ if (typeof jQuery != "undefined") {
 
     jq(document).on("click", "#skipPass", function () {
         jq("#blockPassword").hide();
-        loadScripts();
+        onuploaded();
     });
 
     jq(document).on("click", "#beginEdit:not(.disable)", function () {

web/documentserver-example/ruby/app/assets/stylesheets/stylesheet.scss

@@ -512,10 +512,6 @@ label .checkbox {
     line-height: 150%;
 }
 
-#loadScripts {
-    display: none;
-}
-
 #iframeScripts {
     position: absolute;
     visibility: hidden;

web/documentserver-example/ruby/app/views/home/index.html.erb

@@ -334,10 +334,7 @@
         <span class="errorPass"></span>
         <br />
     </div>
-    <span id="step3" class="step">3. Loading editor scripts.</span>
-    <span class="step-descr">They are loaded only once, they will be cached on your computer.</span>
     <input type="hidden" name="hiddenFileName" id="hiddenFileName" />
-    <br />
     <span class="progress-descr">Note the speed of all operations depends on your connection quality and server location.</span>
     <br />
     <div class="error-message">
@@ -382,7 +379,7 @@
   </div>
 </div>
 
-<span id="loadScripts" data-docs="<%= ConfigurationManager.new.document_server_preloader_uri.to_s %>"></span>
+<iframe id="iframeScripts" src="<%= ConfigurationManager.new.document_server_preloader_uri.to_s %>" width=1 height=1 style="position: absolute; visibility: hidden; top: 0;" ></iframe>
 
 <footer>
   <div class="center">