aboutsummaryrefslogtreecommitdiffstats
path: root/ui/jquery.ui.draggable.js
diff options
context:
space:
mode:
authorFelix Nagel <info@felixnagel.com>2013-06-24 20:28:10 +0200
committerFelix Nagel <info@felixnagel.com>2013-06-24 20:28:10 +0200
commit9992d4626eca1182c9688190ff5642168f2490ec (patch)
tree41bc8629a8c8e3c133bfe4de4fae1da1d6202f90 /ui/jquery.ui.draggable.js
parentab72fd16667cf08cadc0bf8b3375622b0d74d81a (diff)
parentfe9f6ca98634dd82c3cdb907d725c42f97afe951 (diff)
downloadjquery-ui-9992d4626eca1182c9688190ff5642168f2490ec.tar.gz
jquery-ui-9992d4626eca1182c9688190ff5642168f2490ec.zip
Merge branch 'master' into selectmenu
Diffstat (limited to 'ui/jquery.ui.draggable.js')
-rw-r--r--ui/jquery.ui.draggable.js5
1 files changed, 5 insertions, 0 deletions
diff --git a/ui/jquery.ui.draggable.js b/ui/jquery.ui.draggable.js
index bf90d349b..ab1e800cd 100644
--- a/ui/jquery.ui.draggable.js
+++ b/ui/jquery.ui.draggable.js
@@ -78,6 +78,8 @@ $.widget("ui.draggable", $.ui.mouse, {
var o = this.options;
+ $( document.activeElement ).blur();
+
// among others, prevent a drag on a resizable-handle
if (this.helper || o.disabled || $(event.target).closest(".ui-resizable-handle").length > 0) {
return false;
@@ -263,6 +265,9 @@ $.widget("ui.draggable", $.ui.mouse, {
$.ui.ddmanager.dragStop(this, event);
}
+ // The interaction is over; whether or not the click resulted in a drag, focus the element
+ this.element.focus();
+
return $.ui.mouse.prototype._mouseUp.call(this, event);
},