diff options
| author |   Tao Shen <shentao@chinamobile.com> | 2017-04-29 03:39:15 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@open-o.org> | 2017-04-29 03:39:15 +0000 |
| commit | 82b4ce0fb90bf5aa0e431d33236bb3dd73fcbc89 (patch) | |
| tree | 1d8c8ddd07a4f1bfab7c23396f97341354cb1214 | |
| parent | e017b3d52f52f0509dfd8d85c140145ba09386e2 (diff) | |
| parent | 9d58f367c42d52077502ca2255c428b8829e8412 (diff) | |
Merge "modified iframe display bug"
| -rw-r--r-- | login/src/main/webapp/login/html/menu.html | 4 | ||||
| -rw-r--r-- | login/src/main/webapp/login/js/menuApp.js | 8 |
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 = ""; } |