summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshentao <shentao@chinamobile.com>2017-04-28 12:00:02 +0800
committershentao <shentao@chinamobile.com>2017-04-28 12:00:17 +0800
commit9d58f367c42d52077502ca2255c428b8829e8412 (patch)
tree73cdda847090912089195695e7a9c63ace5d9d7e
parent456187a26701866d323c74444b261ef3f43d1778 (diff)
modified iframe display bug
Issue-id:CLIENT-175 Change-Id: I84a93de852114c45b52d8b827cd326c023cf059f Signed-off-by: shentao <shentao@chinamobile.com>
-rw-r--r--login/src/main/webapp/login/html/menu.html4
-rw-r--r--login/src/main/webapp/login/js/menuApp.js8
2 files changed, 5 insertions, 7 deletions
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 = "";
}