From 04c3ff5895e18b5e3ad4145238bd1cf5fb16857b Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Thu, 30 Aug 2018 15:24:08 +0300
Subject: [PATCH] Fix Bug 38447 long loading page

---
 .../nodejs/public/javascripts/jscript.js                  | 4 ++--
 .../nodejs/public/stylesheets/stylesheet.css              | 8 ++++----
 web/documentserver-example/nodejs/views/index.ejs         | 3 +--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/web/documentserver-example/nodejs/public/javascripts/jscript.js b/web/documentserver-example/nodejs/public/javascripts/jscript.js
index 0fff053f..17ce1e7b 100644
--- a/web/documentserver-example/nodejs/public/javascripts/jscript.js
+++ b/web/documentserver-example/nodejs/public/javascripts/jscript.js
@@ -227,7 +227,7 @@ if (typeof jQuery != "undefined") {
         jq("#mainProgress").addClass("embedded");
         jq("#beginEmbedded").addClass("disable");
 
-        jq("#embeddedView").attr("src", url);
+        jq("#uploadSteps").after('<iframe id="embeddedView" src="' + url + '" height="345px" width="600px" frameborder="0" scrolling="no" allowtransparency></iframe>');
     });
 
     jq(document).on("click", ".reload-page", function () {
@@ -244,7 +244,7 @@ if (typeof jQuery != "undefined") {
 
     jq(document).on("click", "#cancelEdit, .dialog-close", function () {
         jq('#hiddenFileName').val("");
-        jq("#embeddedView").attr("src", "");
+        jq("#embeddedView").remove();
         jq.unblockUI();
         if (mustReload) {
             document.location.reload();
diff --git a/web/documentserver-example/nodejs/public/stylesheets/stylesheet.css b/web/documentserver-example/nodejs/public/stylesheets/stylesheet.css
index f5ae3e93..a04a4b03 100644
--- a/web/documentserver-example/nodejs/public/stylesheets/stylesheet.css
+++ b/web/documentserver-example/nodejs/public/stylesheets/stylesheet.css
@@ -125,7 +125,7 @@ label .checkbox {
     font-weight: normal;
     text-align: center;
     text-decoration: none;
-    vertical-align: middle;    
+    vertical-align: middle;
     cursor:pointer;
     border-radius: 6px;
     -moz-border-radius: 6px;
@@ -143,7 +143,7 @@ label .checkbox {
     margin-right: 3px;
     padding: 4px 12px;
 
-    color: #fff; 
+    color: #fff;
 
     background: #3D96C6;
 
@@ -376,7 +376,7 @@ footer {
     vertical-align: top;
 }
 .tableRow {
-	background: transparent;
+    background: transparent;
 
     -moz-transition: all 0.2s ease-in-out;
     -webkit-transition: all 0.2s ease-in-out;
@@ -385,7 +385,7 @@ footer {
     transition: all 0.2s ease-in-out;
 }
 .tableRow:hover {
-	background-color: #ebebeb;
+    background-color: #ebebeb;
 }
 
 .tableHeader {
diff --git a/web/documentserver-example/nodejs/views/index.ejs b/web/documentserver-example/nodejs/views/index.ejs
index f69ed469..ac93344f 100644
--- a/web/documentserver-example/nodejs/views/index.ejs
+++ b/web/documentserver-example/nodejs/views/index.ejs
@@ -1,6 +1,6 @@
 <!--*
  *
- * (c) Copyright Ascensio System Limited 2010-
+ * (c) Copyright Ascensio System Limited 2010-2018
  *
  * The MIT License (MIT)
  *
@@ -235,7 +235,6 @@
                 Please select another file and try again. If you have questions please <a href="mailto:sales@onlyoffice.com">contact us.</a>
             </div>
         </div>
-        <iframe id="embeddedView" src="" height="345px" width="600px" frameborder="0" scrolling="no" allowtransparency></iframe>
         <br />
         <div id="beginEmbedded" class="button disable">Embedded view</div>
         <div id="beginView" class="button disable">View</div>