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 2021/11/22 06:02:11 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2708] wb dropdowns are fixed one more time
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new eb368b3 [OPENMEETINGS-2708] wb dropdowns are fixed one more time
eb368b3 is described below
commit eb368b3617b702f8aa32222de4af3b805cabb23d
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Mon Nov 22 13:02:02 2021 +0700
[OPENMEETINGS-2708] wb dropdowns are fixed one more time
---
openmeetings-web/src/main/front/wb/src/wb-tools.js | 7 +++++++
.../java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html | 2 +-
.../src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html | 6 +++---
openmeetings-web/src/main/webapp/css/raw-wb.css | 2 +-
4 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/openmeetings-web/src/main/front/wb/src/wb-tools.js b/openmeetings-web/src/main/front/wb/src/wb-tools.js
index 165304a..321ba15 100644
--- a/openmeetings-web/src/main/front/wb/src/wb-tools.js
+++ b/openmeetings-web/src/main/front/wb/src/wb-tools.js
@@ -53,6 +53,13 @@ module.exports = class WbTools {
function _initGroupHandle(c) {
c.find('a').off().click(function(e) {
e.stopImmediatePropagation()
+ //let's close all other dropdowns
+ $(this).parents('.tools').find('.dropdown-toggle.show').toArray().forEach(menu => {
+ const dd = bootstrap.Dropdown.getInstance(menu);
+ if (menu !== this && dd) {
+ dd.hide();
+ }
+ });
const stub = $(this).find('.stub');
if (!stub.hasClass(ACTIVE)) {
_btnClick(stub.data('toolType'));
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
index f4b8360..330ca97 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
@@ -72,7 +72,7 @@
<div class="user actions clearfix">
</div>
</div>
- <div id="volume-control-stub" class="om-icon dropdown dropright volume-control align-right">
+ <div id="volume-control-stub" class="om-icon dropdown dropend volume-control align-right">
<a class="fas volume-on" type="button" href="#" wicket:message="title:volume.label"></a>
<div class="dropdown-menu">
<div class="slider" wicket:message="title:volume.label">
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 b60499b..12c5248 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
@@ -54,14 +54,14 @@
<i class="fas fa-times"></i>
<span class="sr-only"><wicket:message key="85"/></span>
</button>
- <div id="wb-area-texts" class="btn-group texts dropleft">
+ <div id="wb-area-texts" class="btn-group texts dropstart">
<a class="dropdown-toggle" data-bs-toggle="dropdown"></a>
<div class="dropdown-menu">
<div wicket:message="title:73" class="clickable om-icon big text"></div>
<div wicket:message="title:82" class="clickable om-icon big textbox"></div>
</div>
</div>
- <div id="wb-area-drawings" class="btn-group drawings dropleft">
+ <div id="wb-area-drawings" class="btn-group drawings dropstart">
<a class="dropdown-toggle" data-bs-toggle="dropdown"></a>
<div class="dropdown-menu">
<div wicket:message="title:74" class="clickable om-icon big paint"></div>
@@ -73,7 +73,7 @@
<div wicket:message="title:wb.tool.white-out" class="clickable om-icon big eraser"></div>
</div>
</div>
- <div id="wb-area-cliparts" class="btn-group cliparts dropleft">
+ <div id="wb-area-cliparts" class="btn-group cliparts dropstart">
<a class="dropdown-toggle" data-bs-toggle="dropdown" wicket:message="title:1323"></a>
<div class="dropdown-menu">
<div wicket:id="clipart" class="clickable om-icon big clipart" data-image="./public/cliparts/"></div>
diff --git a/openmeetings-web/src/main/webapp/css/raw-wb.css b/openmeetings-web/src/main/webapp/css/raw-wb.css
index cbc49fd..c1d7832 100644
--- a/openmeetings-web/src/main/webapp/css/raw-wb.css
+++ b/openmeetings-web/src/main/webapp/css/raw-wb.css
@@ -83,7 +83,7 @@ html[dir="rtl"] .room-block .sb-wb .wb-block {
width: 30px;
height: 30px;
}
-.room-block .sb-wb .wb-block .tools .dropleft .dropdown-toggle::before {
+.room-block .sb-wb .wb-block .tools .dropstart .dropdown-toggle::before {
vertical-align: bottom;
margin-right: 0;
}