Repository: openmeetings Updated Branches: refs/heads/3.3.x 4943f46b0 -> 78078ead5
[OPENMEETINGS-1702] scrollers are restored on room exit Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/78078ead Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/78078ead Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/78078ead Branch: refs/heads/3.3.x Commit: 78078ead5f91adda5e5168a038258218b56f9282 Parents: 4943f46 Author: Maxim Solodovnik <solomax...@gmail.com> Authored: Thu Sep 14 11:24:55 2017 +0700 Committer: Maxim Solodovnik <solomax...@gmail.com> Committed: Thu Sep 14 11:24:55 2017 +0700 ---------------------------------------------------------------------- .../org/apache/openmeetings/web/room/SwfPanel.html | 16 ---------------- .../java/org/apache/openmeetings/web/room/room.js | 4 ++++ 2 files changed, 4 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/78078ead/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.html ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.html index fc318ca..c8e1b0c 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.html @@ -22,22 +22,6 @@ <wicket:head> <meta http-equiv="cache-control" content="no-cache"/> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> - <style type="text/css"> - html,body { /* http://www.quirksmode.org/css/100percheight.html */ - height: 100%; - /* prevent scrollbars */ - margin: 0; - padding: 0; - border: 0 none; - overflow: hidden; - } - body { - background-color: #ffffff; - } - img { - border: 0 none; - } - </style> </wicket:head> <wicket:panel> <div id="swfloading" style="z-index: 666666; position: absolute; top: 50%; left: 50%;"> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/78078ead/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js index aa81d89..4f89d2f 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ +var HtmlOverflow; function setRoomSizes() { var sb = $(".room.sidebar.left") , w = $(window).width() - sb.width() - 8 @@ -72,10 +73,13 @@ function roomLoad() { setRoomSizes(); } }); + HtmlOverflow = $('html,body').css('overflow'); + $('html,body').css('overflow', 'hidden'); Wicket.Event.subscribe("/websocket/closed", roomClosed); Wicket.Event.subscribe("/websocket/error", roomClosed); } function roomUnload() { + $('html,body').css('overflow', HtmlOverflow); $(window).off('resize.openmeetings'); Wicket.Event.unsubscribe("/websocket/closed", roomClosed); Wicket.Event.unsubscribe("/websocket/error", roomClosed);
