Skip to content

Commit

Permalink
Mouse: Changed mouseHandled check to a local var rather than using or…
Browse files Browse the repository at this point in the history
…iginalEvent. Fixed #4333 - Nested draggables problem in IE

(cherry picked from commit dafc941)
  • Loading branch information
kborchers authored and scottgonzalez committed Aug 2, 2011
1 parent 82df692 commit 14ab4f4
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions ui/jquery.ui.mouse.js
Expand Up @@ -12,6 +12,11 @@
*/
(function( $, undefined ) {

var mouseHandled = false;
$( document ).mouseup( function( e ) {
mouseHandled = false;
});

$.widget("ui.mouse", {
options: {
cancel: ':input,option',
Expand Down Expand Up @@ -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));
Expand Down Expand Up @@ -92,7 +95,8 @@ $.widget("ui.mouse", {
.bind('mouseup.'+this.widgetName, this._mouseUpDelegate);

event.preventDefault();
event.originalEvent.mouseHandled = true;

mouseHandled = true;
return true;
},

Expand Down

0 comments on commit 14ab4f4

Please sign in to comment.