diff options
| author | Scott González <scott.gonzalez@gmail.com> | 2011-05-09 10:10:17 -0700 |
|---|---|---|
| committer | Scott González <scott.gonzalez@gmail.com> | 2011-05-09 10:10:17 -0700 |
| commit | f1180e5341aac31349877de3207fb7da558985fa (patch) | |
| tree | fb0bcaebf40e4d7780958e7d91ba3621ada0d9e6 /ui | |
| parent | 5ae44f8a3bdd858aa95c79b5938566ca0a67f373 (diff) | |
| parent | 9c50bdfde0260fc8412eec1c5020ed6b61558ebd (diff) | |
| download | jquery-ui-f1180e5341aac31349877de3207fb7da558985fa.tar.gz jquery-ui-f1180e5341aac31349877de3207fb7da558985fa.zip | |
Merge pull request #235 from kborchers/bug_4333_2
Mouse: Changed mouseHandled check to a local var rather than using originalEvent. Fixed #4333 - Nested draggables problem in IE
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/jquery.ui.mouse.js | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/ui/jquery.ui.mouse.js b/ui/jquery.ui.mouse.js index bfe4a7578..0bd38db85 100644 --- a/ui/jquery.ui.mouse.js +++ b/ui/jquery.ui.mouse.js @@ -12,6 +12,11 @@ */ (function( $, undefined ) { +var mouseHandled = false; +$(document).mousedown(function(e) { + mouseHandled = false; +}); + $.widget("ui.mouse", { options: { cancel: ':input,option', @@ -44,9 +49,7 @@ $.widget("ui.mouse", { _mouseDown: function(event) { // don't let more than one widget handle mouseStart - // TODO: figure out why we have to use originalEvent - event.originalEvent = event.originalEvent || {}; - if (event.originalEvent.mouseHandled) { return; } + if(mouseHandled) {return}; // we may have missed mouseup (out of window) (this._mouseStarted && this._mouseUp(event)); @@ -92,7 +95,8 @@ $.widget("ui.mouse", { .bind('mouseup.'+this.widgetName, this._mouseUpDelegate); event.preventDefault(); - event.originalEvent.mouseHandled = true; + + mouseHandled = true; return true; }, |