Repository: openmeetings Updated Branches: refs/heads/master 22ad5dd90 -> 2c333f2c3
[OPENMEETINGS-1714] minification improved Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/2c333f2c Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/2c333f2c Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/2c333f2c Branch: refs/heads/master Commit: 2c333f2c32de8b931f4b1aec3a30d9113bc23f19 Parents: 22ad5dd Author: Maxim Solodovnik <[email protected]> Authored: Mon Oct 2 15:34:53 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Mon Oct 2 15:34:53 2017 +0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js | 2 +- .../main/java/org/apache/openmeetings/web/room/wb/wb-board.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/2c333f2c/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js index 42cd811..37879b4 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js @@ -65,7 +65,7 @@ var WbArea = (function() { function _resizeWbs() { const w = area.width(), hh = area.height() , wbTabs = area.find(".tabs.ui-tabs") - , tabPanels = wbTabs.find(".ui-tabs-panel"); + , tabPanels = wbTabs.find(".ui-tabs-panel") , wbah = hh - 5 - wbTabs.find("ul.ui-tabs-nav").height(); tabPanels.height(wbah); tabPanels.each(function() { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/2c333f2c/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-board.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-board.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-board.js index f956a1e..eb93b71 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-board.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-board.js @@ -169,8 +169,8 @@ var Wb = function() { .button({icon: 'ui-icon-locked', showLabel: false}) .click(function() { const btn = getBtn() - , isColor = $(this).hasClass('wb-prop-lock-color'); - , c = s.find(isColor ? '.wb-prop-color' : '.wb-prop-fill'); + , isColor = $(this).hasClass('wb-prop-lock-color') + , c = s.find(isColor ? '.wb-prop-color' : '.wb-prop-fill') , enabled = $(this).button('option', 'icon') === 'ui-icon-locked'; $(this).button('option', 'icon', enabled ? 'ui-icon-unlocked' : 'ui-icon-locked'); c.prop('disabled', !enabled);
