aboutsummaryrefslogtreecommitdiffstats
path: root/ui/jquery.ui.mouse.js
diff options
context:
space:
mode:
authorJörn Zaefferer <joern.zaefferer@gmail.com>2011-06-02 14:06:54 +0200
committerJörn Zaefferer <joern.zaefferer@gmail.com>2011-06-02 14:06:54 +0200
commitafe0f72945170879571ebaf060a816b39c9871b8 (patch)
tree8892e33dc624fe920c9d2838cac0d82b34e04882 /ui/jquery.ui.mouse.js
parentcfaddbfb2a49fbd7f511d49f6404c7447469c5b0 (diff)
parent27a4fdd8ed4fe7733ea139022c04bd7ef8033cba (diff)
downloadjquery-ui-afe0f72945170879571ebaf060a816b39c9871b8.tar.gz
jquery-ui-afe0f72945170879571ebaf060a816b39c9871b8.zip
Merge branch 'master' into widget-factory-demo
Diffstat (limited to 'ui/jquery.ui.mouse.js')
-rw-r--r--ui/jquery.ui.mouse.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/ui/jquery.ui.mouse.js b/ui/jquery.ui.mouse.js
index 0bd38db85..582eaf9c0 100644
--- a/ui/jquery.ui.mouse.js
+++ b/ui/jquery.ui.mouse.js
@@ -18,6 +18,7 @@ $(document).mousedown(function(e) {
});
$.widget("ui.mouse", {
+ version: "@VERSION",
options: {
cancel: ':input,option',
distance: 1,
@@ -58,7 +59,7 @@ $.widget("ui.mouse", {
var self = this,
btnIsLeft = (event.which == 1),
- elIsCancel = (typeof this.options.cancel == "string" ? $(event.target).parents().add(event.target).filter(this.options.cancel).length : false);
+ elIsCancel = (typeof this.options.cancel == "string" ? $(event.target).closest(this.options.cancel).length : false);
if (!btnIsLeft || elIsCancel || !this._mouseCapture(event)) {
return true;
}