Repository: openmeetings Updated Branches: refs/heads/master a974b07ec -> 5e366a280
[OPENMEETINGS-1810] wbsize on activities open/closed should be fixed Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/5e366a28 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/5e366a28 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/5e366a28 Branch: refs/heads/master Commit: 5e366a280d8f30c9ca4962822091a915ab110bb9 Parents: a974b07 Author: Maxim Solodovnik <[email protected]> Authored: Thu Jan 11 20:16:25 2018 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Thu Jan 11 20:16:25 2018 +0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/openmeetings/web/admin/admin.js | 2 +- .../main/java/org/apache/openmeetings/web/room/room-base.js | 8 +++++--- .../openmeetings/web/user/calendar/calendar-functions.js | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/5e366a28/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/admin.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/admin.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/admin.js index 3574ce8..a35cd2c 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/admin.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/admin.js @@ -4,7 +4,7 @@ function adminPanelInit() { extAdminPanelInit(); } const f = $('#adminForm'), t = $('#adminTable') - , h = $(window).height() - 5; + , h = window.innerHeight - 5; if (f.length === 1 && t.length === 1) { f.height(h - f.position().top); t.height(h - t.position().top); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/5e366a28/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room-base.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room-base.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room-base.js index ba3526f..4934780 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room-base.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room-base.js @@ -633,10 +633,12 @@ var Room = (function() { return sb === undefined ? 0 : sb.width() + parseInt(sb.css(sbSide)); } function _setSize() { - const sbW = _sbWidth() - , w = $(window).width() - sbW - 8 + const tw = window.innerWidth + , th = window.innerHeight + , sbW = _sbWidth() + , w = tw - sbW - 8 , ah = !!activities && activities.is(':visible') ? activities.height() : 0 - , h = $(window).height() - menuHeight - 3 + , h = th - menuHeight - 3 , hh = h - 5 , p = sb.find('.tabs') , ulh = $("ul", p).height() http://git-wip-us.apache.org/repos/asf/openmeetings/blob/5e366a28/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js index af4bc54..6274bf2 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js @@ -3,7 +3,7 @@ * @author Sebastien Briquet */ function getCalendarHeight() { - return $(window).height() - $('#${markupId}').position().top - 20; + return window.innerHeight - $('#${markupId}').position().top - 20; } function setCalendarHeight() { const cal = $('#${markupId}');
