You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by se...@apache.org on 2020/05/18 21:15:47 UTC

[openmeetings] branch feature/OPENMEETINGS-2360-fix-settings-dialog-touch-surface created (now 5bf5833)

This is an automated email from the ASF dual-hosted git repository.

sebawagner pushed a change to branch feature/OPENMEETINGS-2360-fix-settings-dialog-touch-surface
in repository https://gitbox.apache.org/repos/asf/openmeetings.git.


      at 5bf5833  OPENMEETINGS-2360 Fix draggable on ui-titlebar and button to close outside of it.

This branch includes the following new commits:

     new 5bf5833  OPENMEETINGS-2360 Fix draggable on ui-titlebar and button to close outside of it.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[openmeetings] 01/01: OPENMEETINGS-2360 Fix draggable on ui-titlebar and button to close outside of it.

Posted by se...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

sebawagner pushed a commit to branch feature/OPENMEETINGS-2360-fix-settings-dialog-touch-surface
in repository https://gitbox.apache.org/repos/asf/openmeetings.git

commit 5bf583350b22fef587328760d1ef71bc7d9f504b
Author: Sebastian Wagner <se...@apache.org>
AuthorDate: Tue May 19 09:15:05 2020 +1200

    OPENMEETINGS-2360 Fix draggable on ui-titlebar and button to close outside of it.
---
 .../main/java/org/apache/openmeetings/web/room/wb/WbPanel.html | 10 +++++-----
 .../java/org/apache/openmeetings/web/room/wb/raw-wb-board.js   |  1 +
 2 files changed, 6 insertions(+), 5 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 95ad14d..dee65c8 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
@@ -163,12 +163,12 @@
 		<div id="wb-tool-settings" class="wb-tool-settings ui-widget-content">
 			<div wicket:message="title:843" class="header ui-dialog-titlebar ui-widget-header ui-helper-clearfix ui-draggable-handle">
 				<span class="ui-dialog-title"><wicket:message key="843"/></span>
-				<button type="button" class="ui-button ui-corner-all ui-widget ui-button-icon-only ui-dialog-titlebar-close" wicket:message="title:85">
-					<span class="ui-button-icon ui-icon ui-icon-closethick"></span>
-					<span class="ui-button-icon-space"> </span>
-					<wicket:message key="85"/>
-				</button>
 			</div>
+			<button type="button" class="ui-button ui-corner-all ui-widget ui-button-icon-only ui-dialog-titlebar-close" wicket:message="title:85">
+				<span class="ui-button-icon ui-icon ui-icon-closethick"></span>
+				<span class="ui-button-icon-space"> </span>
+				<wicket:message key="85"/>
+			</button>
 			<div class="tab props">
 				<div class="prop-row">
 					<div class="block lbl" wicket:message="title:546"><wicket:message key="545"/></div>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js
index 7193bbc..dd8426b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js
@@ -242,6 +242,7 @@ var Wb = function() {
 		});
 		settings.draggable({
 			scroll: false
+			, handle: '.ui-dialog-titlebar'
 			, containment: 'body'
 			, start: function() {
 				if (!!settings.css('bottom')) {