This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a commit to branch feature/OPENMEETINGS-2339-update-sharer-dialog-move-close-button-on-top in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit fdf7feea0ff8452df91ef7220ac2dfaac6fe06eb Author: Sebastian Wagner <sebawag...@apache.org> AuthorDate: Sat May 16 22:19:39 2020 +1200 OPENMEETINGS-2339 Fix sharer window for touch surface close icon clone. --- .../main/java/org/apache/openmeetings/web/room/raw-sharer.js | 10 ++++++++++ openmeetings-web/src/main/webapp/css/raw-room.css | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-sharer.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-sharer.js index ce89b6d..4ae4334 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-sharer.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-sharer.js @@ -26,6 +26,16 @@ var Sharer = (function() { , autoOpen: false , resizable: false }); + + // Fix to move the close icon on top of the .ui-dialog-titlebar cause otherwise + // touch-events are broken and you won't be able to close the dialog + var closeIcon = sharer.parent().find('.ui-dialog-titlebar-close').clone(); + sharer.parent().append(closeIcon); + sharer.parent().find('.ui-dialog-titlebar-close').first().remove(); + sharer.parent().find('.ui-dialog-titlebar-close').click(function() { + sharer.dialog('close'); + }); + if (!VideoUtil.sharingSupported()) { sharer.find('.container').remove(); sharer.find('.alert').show(); diff --git a/openmeetings-web/src/main/webapp/css/raw-room.css b/openmeetings-web/src/main/webapp/css/raw-room.css index 2aea7c6..7d2596c 100644 --- a/openmeetings-web/src/main/webapp/css/raw-room.css +++ b/openmeetings-web/src/main/webapp/css/raw-room.css @@ -429,6 +429,10 @@ html[dir="rtl"] .room-block .sb-wb .sidebar { { background-color: var(--white); } +.sharer .ui-dialog-titlebar-close { + position: absolute; + top: 20px +} .user-video .ui-dialog-titlebar .buttonpane { position: absolute; right: 2px;