diff --git a/tests/draggable.js b/tests/draggable.js index 74089e72f..c029df6b0 100644 --- a/tests/draggable.js +++ b/tests/draggable.js @@ -628,6 +628,12 @@ test("{ helper: 'clone' }, absolute with scroll offset on root and parent", func }); +module("draggable: behaviour"); + +test("Events should not be executed on the element if drag is initiated", function() { + //TODO: Implement missing test +}); + module("draggable: Tickets"); diff --git a/ui/ui.core.js b/ui/ui.core.js index 877b0d023..1940385d1 100644 --- a/ui/ui.core.js +++ b/ui/ui.core.js @@ -345,9 +345,16 @@ $.ui.mouse = { _mouseInit: function() { var self = this; - this.element.bind('mousedown.'+this.widgetName, function(e) { - return self._mouseDown(e); - }); + this.element + .bind('mousedown.'+this.widgetName, function(e) { + return self._mouseDown(e); + }) + .bind('click.'+this.widgetName, function(e) { + if(self._preventClickEvent) { + self._preventClickEvent = false; + return false; + } + }); // Prevent text selection in IE if ($.browser.msie) { @@ -437,6 +444,7 @@ $.ui.mouse = { if (this._mouseStarted) { this._mouseStarted = false; + this._preventClickEvent = true; this._mouseStop(e); }