You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by sv...@apache.org on 2018/10/23 13:24:38 UTC
wicket git commit: WICKET-6601 dont stop mouse down on drag start
Repository: wicket
Updated Branches:
refs/heads/wicket-8.x e57686bcf -> be57b4889
WICKET-6601 dont stop mouse down on drag start
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/be57b488
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/be57b488
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/be57b488
Branch: refs/heads/wicket-8.x
Commit: be57b48893183dcd363ecf42c026e0b91cc19f21
Parents: e57686b
Author: Sven Meier <sv...@apache.org>
Authored: Tue Oct 23 15:24:21 2018 +0200
Committer: Sven Meier <sv...@apache.org>
Committed: Tue Oct 23 15:24:21 2018 +0200
----------------------------------------------------------------------
.../java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js | 2 --
.../apache/wicket/extensions/ajax/markup/html/modal/res/modal.js | 4 ++--
2 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/be57b488/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
index 1875d65..8370208 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
@@ -2322,8 +2322,6 @@
document.onmouseout = Wicket.Drag.mouseOut;
Wicket.Drag.current = element;
-
- return false;
},
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/be57b488/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
index 8b66687..7f95529 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
@@ -766,8 +766,8 @@
* Called when dragging has started.
*/
onBegin: function(element, event) {
- // ignore anything inside the content
- if (jQuery(event.target).closest('.w_content').size()) {
+ // all resize elements must be clicked directly
+ if (jQuery(element).is('.w_caption') === false && element !== event.target) {
return false;
}