[openmeetings] 01/01: OPENMEETINGS-2357 Add handle for draggable and move close icon outside of titlebar.

[se...@apache.org]

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

sebawagner pushed a commit to branch feature/OPENMEETINGS-2357-fix-math-dialog-to-apply-handle-for-draggable
in repository https://gitbox.apache.org/repos/asf/openmeetings.git

commit 3e36e24a82b4759be1ce1bae2613c8deea63e874
Author: Sebastian Wagner <se...@apache.org>
AuthorDate: Mon May 18 08:11:34 2020 +1200

    OPENMEETINGS-2357 Add handle for draggable and move close icon outside of titlebar.
---
 .../main/java/org/apache/openmeetings/web/room/wb/WbPanel.html | 10 +++++-----
 .../java/org/apache/openmeetings/web/room/wb/raw-wb-board.js   |  4 +++-
 2 files changed, 8 insertions(+), 6 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 81ba3c2..95ad14d 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
@@ -195,12 +195,12 @@
 		<div id="wb-formula" class="wb-formula ui-corner-all ui-widget-content">
 			<div wicket:message="title:wb.tool.math.formula" class="header ui-dialog-titlebar ui-corner-all ui-widget-header ui-helper-clearfix ui-draggable-handle">
 				<span class="ui-dialog-title"><wicket:message key="wb.tool.math.formula"/></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="text-container"><textarea></textarea></div>
 			<div>
 				<a class="latex-guide" wicket:message="href:wb.tool.math.guide.url" target="_blank"><wicket:message key="wb.tool.math.guide.lbl"/></a>
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 30c1cec..7193bbc 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
@@ -351,6 +351,7 @@ var Wb = function() {
 				}).parent().css('text-align', Settings.isRtl ? 'left' : 'right');
 				math.draggable({
 					scroll: false
+					, handle: '.ui-dialog-titlebar'
 					, containment: 'body'
 					, start: function() {
 						if (!!math.css('bottom')) {
@@ -362,7 +363,8 @@ var Wb = function() {
 							return false;
 						}
 					}
-				}).resizable({
+				});
+				math.resizable({
 					alsoResize: math.find('.text-container')
 				});
 			case NONE: