[openmeetings] branch master updated: [OPENMEETINGS-2754] confirmations are displayed in fullscreen-mode

[solomax]

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 b0db1d65f [OPENMEETINGS-2754] confirmations are displayed in 
fullscreen-mode
b0db1d65f is described below

commit b0db1d65f41935257c2c8f7163a1239c0230d4d2
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Wed Dec 21 12:38:53 2022 +0700

    [OPENMEETINGS-2754] confirmations are displayed in fullscreen-mode
---
 openmeetings-web/src/main/front/wb/src/wb-area.js  | 1 +
 openmeetings-web/src/main/front/wb/src/wb-tools.js | 2 ++
 pom.xml                                            | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/openmeetings-web/src/main/front/wb/src/wb-area.js 
b/openmeetings-web/src/main/front/wb/src/wb-area.js
index 5f7abef81..e8705db7d 100644
--- a/openmeetings-web/src/main/front/wb/src/wb-area.js
+++ b/openmeetings-web/src/main/front/wb/src/wb-area.js
@@ -173,6 +173,7 @@ module.exports = class DrawWbArea extends WbAreaBase {
                        closeBtn.confirmation({
                                title: closeBtn.attr('title')
                                , confirmationEvent: 'bla'
+                               , container: '.room-block .wb-block .wb-area'
                                , onConfirm: function() {
                                        const prevLi = li.prev()
                                                , prevWbId = prevLi.length > 0 
? prevLi.find('a').data('wb-id') : -1;
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 b4c9cb5f4..895b8b323 100644
--- a/openmeetings-web/src/main/front/wb/src/wb-tools.js
+++ b/openmeetings-web/src/main/front/wb/src/wb-tools.js
@@ -331,6 +331,7 @@ module.exports = class WbTools {
                                        clearAll.confirmation({
                                                title: clearAll.attr('title')
                                                , confirmationEvent: 
'om-clear-all'
+                                               , container: wbEl[0]
                                                , onConfirm: () => 
OmUtil.wbAction({action: 'clearAll', data: {wbId: wb.getId()}})
                                        }).removeClass('disabled');
                                case Role.WHITEBOARD:
@@ -352,6 +353,7 @@ module.exports = class WbTools {
                                        const clearSlide = 
tools.find('.om-icon.clear-slide');
                                        clearSlide.confirmation({
                                                title: clearSlide.attr('title')
+                                               , container: wbEl[0]
                                                , confirmationEvent: 
'om-clear-slide'
                                                , onConfirm: () => 
OmUtil.wbAction({action: 'clearSlide', data: {wbId: wb.getId(), slide: 
wb.slide}})
                                        });
diff --git a/pom.xml b/pom.xml
index 673106d1c..1925d949f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,7 +83,7 @@
                <wicket.version>9.12.0</wicket.version>
                <wicket-jquery-ui.version>9.11.0</wicket-jquery-ui.version>
                <wicketstuff.version>9.12.0</wicketstuff.version>
-               <wicket-bootstrap.version>6.0.0-M8</wicket-bootstrap.version>
+               
<wicket-bootstrap.version>6.0.0-M9-SNAPSHOT</wicket-bootstrap.version>
                <font-awesome.version>6.2.0</font-awesome.version>
                <spring.version>5.3.24</spring.version>
                <tomcat.version>9.0.70</tomcat.version>