This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a commit to branch feature/openmeetings-2251-whiteboard-tab-button-right-click in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 495e8cf5a597b4367f4c1e7dbb1eebdc23e101de Author: Sebastian Wagner <sebawag...@apache.org> AuthorDate: Sun Apr 12 12:18:30 2020 +1200 OPENMEETINGS-2251 Fix JS and CSS for tabbar for right click menu --- .../org/apache/openmeetings/web/room/wb/WbPanel.html | 12 ++++++++---- .../apache/openmeetings/web/room/wb/raw-wb-area.js | 19 ++++++++++--------- openmeetings-web/src/main/webapp/css/raw-wb.css | 3 ++- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html index ecb6310..9d8d1b0 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html @@ -39,10 +39,14 @@ <div id="wb-tabbar-ctrls-right"> <div class="next clickable om-icon big"></div> </div> - <ul><li id="wb-area-tab" class="nav-item"> - <a class="nav-link" data-toggle="tab" role="tab"><span></span></a> - </li></ul> - <button id="wb-tab-close" class="btn btn-sm btn-outline-secondary" + <ul> + <li id="wb-area-tab" class="nav-item"> + <a class="nav-link" data-toggle="tab" role="tab"> + <span class="wb-nav-tab-text"></span> + </a> + </li> + </ul> + <button id="wb-tab-close" class="btn btn-sm wb-tab-close" wicket:message="title:85,data-btn-ok-label:54,data-btn-cancel-label:lbl.cancel,data-title:832,data-content:1313" data-btn-ok-class="btn btn-sm btn-danger" data-btn-ok-icon-class="fas fa-exclamation-triangle" diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-area.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-area.js index 217872b..4a65861 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-area.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-area.js @@ -131,6 +131,14 @@ var DrawWbArea = function() { } const link = li.find('a') , wbId = link.data('wb-id'); + // Apply right click menu only to the text item + li.find(".nav-link").find("span").first().contextmenu( + function(e) { + e.preventDefault(); + $('#wb-rename-menu').show().data('wb-id', wbId) + .position({my: 'left top', collision: 'none', of: _getWbTab(wbId)}); + }); + link.append(OmUtil.tmpl('#wb-tab-close')); li.find('button') .confirmation({ @@ -248,7 +256,8 @@ var DrawWbArea = function() { callback(); } $('#wb-rename-menu').menu().find('.wb-rename').click(function() { - _getWbTab($(this).parent().data('wb-id')).find('a span').trigger('dblclick'); + const textSpan = _getWbTab($(this).parent().data('wb-id')).find('.wb-nav-tab-text').first(); + textSpan.trigger('dblclick'); }); } @@ -268,14 +277,6 @@ var DrawWbArea = function() { , tcid = __getWbContentId(obj.wbId) , wb = OmUtil.tmpl('#wb-area', tcid).attr('aria-labelledby', tid) , li = OmUtil.tmpl('#wb-area-tab') - .contextmenu(function(e) { - if (role !== PRESENTER) { - return; - } - e.preventDefault(); - $('#wb-rename-menu').show().data('wb-id', obj.wbId) - .position({my: 'left top', collision: 'none', of: _getWbTab(obj.wbId)}); - }) , link = li.find('a'); link.attr('id', tid).attr('data-wb-id', obj.wbId).attr('href', '#' + tcid).attr('aria-controls', tcid); _setTabName(link, obj.name) diff --git a/openmeetings-web/src/main/webapp/css/raw-wb.css b/openmeetings-web/src/main/webapp/css/raw-wb.css index 9f1587c..277c9fa 100644 --- a/openmeetings-web/src/main/webapp/css/raw-wb.css +++ b/openmeetings-web/src/main/webapp/css/raw-wb.css @@ -45,7 +45,8 @@ html[dir="rtl"] .room-block .sb-wb .wb-block { position: relative; padding-right: 25px; } -.room-block .sb-wb .wb-block .tabs .wb-tabbar li a button { +.wb-tab-close { + color: var(--secondary); width: 20px; height: 20px; padding: 0;