You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/11/02 07:24:32 UTC
openmeetings git commit: [OPENMEETINGS-1734] room with hidden TopBar
seems to work
Repository: openmeetings
Updated Branches:
refs/heads/4.0.x 6618c9388 -> d4faf0526
[OPENMEETINGS-1734] room with hidden TopBar seems to work
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/d4faf052
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/d4faf052
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/d4faf052
Branch: refs/heads/4.0.x
Commit: d4faf05266c0fc655a7e3a918156581dea4537fb
Parents: 6618c93
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Thu Nov 2 14:24:25 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Thu Nov 2 14:24:25 2017 +0700
----------------------------------------------------------------------
.../src/main/java/org/apache/openmeetings/web/room/room.js | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d4faf052/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 1abd551..b4839d0 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
@@ -533,11 +533,13 @@ var VideoManager = (function() {
})();
var Room = (function() {
const self = {};
- let options;
+ let options, menuHeight;
function _init(_options) {
options = _options;
window.WbArea = options.interview ? InterviewWbArea() : DrawWbArea();
+ const menu = $('.room.box .room.menu');
+ menuHeight = menu.length === 0 ? 0 : menu.height();
VideoManager.init();
Activities.init();
}
@@ -579,7 +581,7 @@ var Room = (function() {
function _setSize() {
const sb = $(".room.sidebar")
, w = $(window).width() - sb.width() - 8
- , h = $(window).height() - $('#menu').height() - 3
+ , h = $(window).height() - menuHeight - 3
, p = sb.find('.tabs')
, holder = $('.room.holder');
sb.height(h);
@@ -672,6 +674,7 @@ var Room = (function() {
}
self.init = _init;
+ self.getMenuHeight = function() { return menuHeight; };
self.getOptions = function() { return JSON.parse(JSON.stringify(options)); };
self.setRights = function(_r) { return options.rights = _r; };
self.setSize = _setSize;