diff options
| author | Scott González <scott.gonzalez@gmail.com> | 2011-08-02 16:24:27 -0700 |
|---|---|---|
| committer | Scott González <scott.gonzalez@gmail.com> | 2011-08-02 16:24:27 -0700 |
| commit | e15c32d06763afd2376c61642397e7fc98338958 (patch) | |
| tree | c793afaed50d535e468a3aa7c177ecbcd75fdb94 /ui | |
| parent | 6ca310f49a010dc0c650da155dab378544f08363 (diff) | |
| parent | dafc941b3632bb79823a72c36bfae7f1f985ca25 (diff) | |
| download | jquery-ui-e15c32d06763afd2376c61642397e7fc98338958.tar.gz jquery-ui-e15c32d06763afd2376c61642397e7fc98338958.zip | |
Merge pull request #413 from kborchers/bug_4333_3
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 054e5dc63..3e6ead8cd 100644 --- a/ui/jquery.ui.mouse.js +++ b/ui/jquery.ui.mouse.js @@ -12,6 +12,11 @@ */ (function( $, undefined ) { +var mouseHandled = false; +$( document ).mouseup( function( e ) { + mouseHandled = false; +}); + $.widget("ui.mouse", { version: "@VERSION", options: { @@ -45,9 +50,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)); @@ -93,7 +96,8 @@ $.widget("ui.mouse", { .bind('mouseup.'+this.widgetName, this._mouseUpDelegate); event.preventDefault(); - event.originalEvent.mouseHandled = true; + + mouseHandled = true; return true; }, |