diff options
| author | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2013-11-16 12:25:21 +0100 |
|---|---|---|
| committer | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2013-11-16 12:25:21 +0100 |
| commit | 43772f3e5bb531d917bec884bfbd0be196110fd8 (patch) | |
| tree | d60d96a569eb47f901b8a800a8fc0f0f95e6c70e /ui/jquery.ui.mouse.js | |
| parent | 0be76bbcfd7a2092aca1b4b01b90dab4e4fe00da (diff) | |
| parent | 9fd0e86820dcea532d5357e0b814653746d62889 (diff) | |
| download | jquery-ui-43772f3e5bb531d917bec884bfbd0be196110fd8.tar.gz jquery-ui-43772f3e5bb531d917bec884bfbd0be196110fd8.zip | |
Merge branch 'master' 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 ); } |