From 9d58f367c42d52077502ca2255c428b8829e8412 Mon Sep 17 00:00:00 2001
From: shentao <shentao@chinamobile.com>
Date: Fri, 28 Apr 2017 12:00:02 +0800
Subject: modified iframe display bug

Issue-id:CLIENT-175

Change-Id: I84a93de852114c45b52d8b827cd326c023cf059f
Signed-off-by: shentao <shentao@chinamobile.com>
---
 login/src/main/webapp/login/html/menu.html | 4 +---
 login/src/main/webapp/login/js/menuApp.js  | 8 ++++----
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'login')

diff --git a/login/src/main/webapp/login/html/menu.html b/login/src/main/webapp/login/html/menu.html
index 713bedee..bd10fe16 100644
--- a/login/src/main/webapp/login/html/menu.html
+++ b/login/src/main/webapp/login/html/menu.html
@@ -279,9 +279,7 @@
                             </a>
                         </div>
                     </div>
-                    <div id="mainFrame_div">
-                        <iframe id="mainFrame" name="mainFrame" frameBorder="0" scrolling="no" width="100%" height="100%" onload="iFrameHeight()"></iframe>
-                    </div>
+                    <iframe id="mainFrame" name="mainFrame" frameBorder="0" scrolling="no" width="100%" height="100%" onload="iFrameHeight()"></iframe>
                 </div>
             </div>
         </div>
diff --git a/login/src/main/webapp/login/js/menuApp.js b/login/src/main/webapp/login/js/menuApp.js
index 3696eb15..8a82de1a 100644
--- a/login/src/main/webapp/login/js/menuApp.js
+++ b/login/src/main/webapp/login/js/menuApp.js
@@ -65,15 +65,15 @@ function iFrameHeight() {
 
 function displayIframe() {
     var dashboard_div = document.getElementById("dashboard_div");
-    var mainFrame_div = document.getElementById("mainFrame_div");
+    var mainFrame = document.getElementById("mainFrame");
     dashboard_div.style.display = "none";
-    mainFrame_div.style.display = "";
+    mainFrame.style.display = "";
 }
 
 function displayDashboard() {
     var dashboard_div = document.getElementById("dashboard_div");
-    var mainFrame_div = document.getElementById("mainFrame_div");
-    mainFrame_div.style.display = "none";
+    var mainFrame = document.getElementById("mainFrame");
+    mainFrame.style.display = "none";
     dashboard_div.style.display = "";
 }
 
-- 
cgit 1.2.3-korg