diff options
author | Felix Nagel <info@felixnagel.com> | 2012-11-10 01:40:05 +0100 |
---|---|---|
committer | Felix Nagel <info@felixnagel.com> | 2012-11-10 01:40:05 +0100 |
commit | 7ce8e0515ea7cc513c3c065946c85cf2d1aa5652 (patch) | |
tree | a0337f9f7d8d0d27a7cdb78a63ee152d8357b32f /ui/jquery.ui.mouse.js | |
parent | 94b3a65c66e338fc6f697d13fc77d7f19b8666ae (diff) | |
parent | d6c6b7dc3381432f50212b4f458931b2521ecb56 (diff) | |
download | jquery-ui-7ce8e0515ea7cc513c3c065946c85cf2d1aa5652.tar.gz jquery-ui-7ce8e0515ea7cc513c3c065946c85cf2d1aa5652.zip |
Merge branch 'master' into selectmenu
Diffstat (limited to 'ui/jquery.ui.mouse.js')
-rw-r--r-- | ui/jquery.ui.mouse.js | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ui/jquery.ui.mouse.js b/ui/jquery.ui.mouse.js index f5069d00c..6abd5ceaf 100644 --- a/ui/jquery.ui.mouse.js +++ b/ui/jquery.ui.mouse.js @@ -14,7 +14,7 @@ (function( $, undefined ) { var mouseHandled = false; -$( document ).mouseup( function( e ) { +$( document ).mouseup( function() { mouseHandled = false; }); @@ -104,14 +104,14 @@ $.widget("ui.mouse", { .bind('mouseup.'+this.widgetName, this._mouseUpDelegate); event.preventDefault(); - + mouseHandled = true; return true; }, _mouseMove: function(event) { // IE mouseup check - mouseup happened when mouse was out of window - if ($.ui.ie && !(document.documentMode >= 9) && !event.button) { + if ($.ui.ie && ( !document.documentMode || document.documentMode < 9 ) && !event.button) { return this._mouseUp(event); } @@ -155,15 +155,15 @@ $.widget("ui.mouse", { ); }, - _mouseDelayMet: function(event) { + _mouseDelayMet: function(/* event */) { return this.mouseDelayMet; }, // These are placeholder methods, to be overriden by extending plugin - _mouseStart: function(event) {}, - _mouseDrag: function(event) {}, - _mouseStop: function(event) {}, - _mouseCapture: function(event) { return true; } + _mouseStart: function(/* event */) {}, + _mouseDrag: function(/* event */) {}, + _mouseStop: function(/* event */) {}, + _mouseCapture: function(/* event */) { return true; } }); })(jQuery); |