aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Gruntfile.js2
-rw-r--r--src/.jshintrc3
-rw-r--r--src/core.js3
-rw-r--r--src/effects.js2
-rw-r--r--src/event.js4
5 files changed, 5 insertions, 9 deletions
diff --git a/Gruntfile.js b/Gruntfile.js
index 19f0f251e..2317544ad 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -7,7 +7,7 @@ module.exports = function( grunt ) {
"dist/jquery.min.map",
"dist/jquery.min.js"
],
- gzip = require("gzip-js"),
+ gzip = require("gzip-js"),
readOptionalJSON = function( filepath ) {
var data = {};
try {
diff --git a/src/.jshintrc b/src/.jshintrc
index b5b056f25..ef8723031 100644
--- a/src/.jshintrc
+++ b/src/.jshintrc
@@ -11,12 +11,11 @@
"maxerr": 100,
"eqnull": true,
- "evil": true,
"sub": true,
"boss": true,
"browser": true,
- "wsh": true,
+ "es5": true,
"globals": {
"jQuery": true,
diff --git a/src/core.js b/src/core.js
index 66c60774b..67fa24c77 100644
--- a/src/core.js
+++ b/src/core.js
@@ -404,8 +404,7 @@ jQuery.extend({
isArray: Array.isArray,
isWindow: function( obj ) {
- /* jshint eqeqeq: false */
- return obj != null && obj == obj.window;
+ return obj != null && obj === obj.window;
},
isNumeric: function( obj ) {
diff --git a/src/effects.js b/src/effects.js
index c0f558aec..96370920b 100644
--- a/src/effects.js
+++ b/src/effects.js
@@ -242,7 +242,7 @@ jQuery.Animation = jQuery.extend( Animation, {
});
function defaultPrefilter( elem, props, opts ) {
- /*jshint validthis:true */
+ /* jshint validthis: true */
var index, prop, value, length, dataShow, toggle, tween, hooks, oldfire,
anim = this,
style = elem.style,
diff --git a/src/event.js b/src/event.js
index 33c8194c3..a9620e241 100644
--- a/src/event.js
+++ b/src/event.js
@@ -402,9 +402,7 @@ jQuery.event = {
// Avoid non-left-click bubbling in Firefox (#3861)
if ( delegateCount && cur.nodeType && (!event.button || event.type !== "click") ) {
- /* jshint eqeqeq: false */
- for ( ; cur != this; cur = cur.parentNode || this ) {
- /* jshint eqeqeq: true */
+ for ( ; cur !== this; cur = cur.parentNode || this ) {
// Don't process clicks on disabled elements (#6911, #8165, #11382, #11764)
if ( cur.disabled !== true || event.type !== "click" ) {