diff options
| author | Felix Nagel <info@felixnagel.com> | 2013-11-26 00:18:25 +0100 |
|---|---|---|
| committer | Felix Nagel <info@felixnagel.com> | 2013-11-26 00:18:25 +0100 |
| commit | 5bc7fc2b1a248063b4d52086dfc32fae8601680e (patch) | |
| tree | 82c176a82f64ca3c1a26648b9e3bf0d2f7282dd8 /ui/jquery.ui.mouse.js | |
| parent | c20f1f8457802f90f8f06bcd2a33c340c2226b7c (diff) | |
| parent | 9a5f20bc7d5218f864fb65d5d20775596065280d (diff) | |
| download | jquery-ui-5bc7fc2b1a248063b4d52086dfc32fae8601680e.tar.gz jquery-ui-5bc7fc2b1a248063b4d52086dfc32fae8601680e.zip | |
Merge branch 'selectmenu' of github.com:jquery/jquery-ui into selectmenu
Diffstat (limited to 'ui/jquery.ui.mouse.js')
| -rw-r--r-- | ui/jquery.ui.mouse.js | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ui/jquery.ui.mouse.js b/ui/jquery.ui.mouse.js index ca774e3da..36b9f2ba0 100644 --- a/ui/jquery.ui.mouse.js +++ b/ui/jquery.ui.mouse.js @@ -56,7 +56,9 @@ $.widget("ui.mouse", { _mouseDown: function(event) { // don't let more than one widget handle mouseStart - if( mouseHandled ) { return; } + if ( mouseHandled ) { + return; + } // we may have missed mouseup (out of window) (this._mouseStarted && this._mouseUp(event)); @@ -114,9 +116,9 @@ $.widget("ui.mouse", { // IE mouseup check - mouseup happened when mouse was out of window if ($.ui.ie && ( !document.documentMode || document.documentMode < 9 ) && !event.button) { return this._mouseUp(event); - } + // Iframe mouseup check - mouseup occurred in another document - else if ( !event.which ) { + } else if ( !event.which ) { return this._mouseUp( event ); } |