aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--grunt.js5
-rw-r--r--ui/jquery.ui.mouse.js14
2 files changed, 8 insertions, 11 deletions
diff --git a/grunt.js b/grunt.js
index 91293e6bc..524421be7 100644
--- a/grunt.js
+++ b/grunt.js
@@ -285,10 +285,7 @@ grunt.initConfig({
})
},
lint: {
- ui: grunt.file.expandFiles( "ui/*.js" ).filter(function( file ) {
- // TODO remove items from this list once rewritten
- return !( /(mouse)\.js$/ ).test( file );
- }),
+ ui: "ui/*.js",
grunt: [ "grunt.js", "build/**/*.js" ],
tests: "tests/unit/**/*.js"
},
diff --git a/ui/jquery.ui.mouse.js b/ui/jquery.ui.mouse.js
index cdc063f91..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;
});
@@ -111,7 +111,7 @@ $.widget("ui.mouse", {
_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);