Update grunt-contrib-jshint to 0.3.0, close gh-1204.

(cherry picked from 4adde5d14534799f3bcfac2771e1513be8a56a2f)

Conflicts:
	src/data.js
	src/effects.js

diff --git a/package.json b/package.json
index b56b5c7bc9d46ea2712ce36b2a6588b0bbbeb721..801848461a2d253497ff155ebd584f367627f4b4 100644 (file)
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
                "grunt-git-authors": "1.2.0",
                "grunt-update-submodules": "0.2.0",
                "grunt-contrib-watch": "0.3.1",
-               "grunt-contrib-jshint": "0.1.1rc6",
+               "grunt-contrib-jshint": "0.3.0",
                "grunt-contrib-uglify": "0.1.2",
                "grunt": "0.4.1",
                "gzip-js": "0.3.1",

diff --git a/src/.jshintrc b/src/.jshintrc
index fff75a6a8a0bf03c37b24865413f59de1dc81c4f..b5b056f2591dc3bf7008e532c85689ef30dad734 100644 (file)
--- a/src/.jshintrc
+++ b/src/.jshintrc
@@ -3,15 +3,17 @@
        "expr": true,
        "newcap": false,
        "quotmark": "double",
-       "regexdash": true,
        "trailing": true,
        "undef": true,
        "unused": true,
+       "latedef": false,
+       "eqeqeq": true,
        "maxerr": 100,
 
        "eqnull": true,
        "evil": true,
        "sub": true,
+       "boss": true,
 
        "browser": true,
        "wsh": true,

diff --git a/src/ajax.js b/src/ajax.js
index 3ceb82c6de9faa18064bb872b382e914947168b7..e965a3e8a5362c4c9459f398e6dfe70c9a2b2415 100644 (file)
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -444,8 +444,8 @@ jQuery.extend({
                        parts = rurl.exec( s.url.toLowerCase() );
                        s.crossDomain = !!( parts &&
                                ( parts[ 1 ] !== ajaxLocParts[ 1 ] || parts[ 2 ] !== ajaxLocParts[ 2 ] ||
-                                       ( parts[ 3 ] || ( parts[ 1 ] === "http:" ? 80 : 443 ) ) !=
-                                               ( ajaxLocParts[ 3 ] || ( ajaxLocParts[ 1 ] === "http:" ? 80 : 443 ) ) )
+                                       ( parts[ 3 ] || ( parts[ 1 ] === "http:" ? "80" : "443" ) ) !==
+                                               ( ajaxLocParts[ 3 ] || ( ajaxLocParts[ 1 ] === "http:" ? "80" : "443" ) ) )
                        );
                }
 

diff --git a/src/attributes.js b/src/attributes.js
index 37addf4a2007e76f4abc5a413e8f698bda4d3523..665e6ba9d3d64fee757de151bf9d006a85481237 100644 (file)
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -276,14 +276,14 @@ jQuery.extend({
                                        options = elem.options,
                                        values = jQuery.makeArray( value ),
                                        i = options.length;
-                               
+
                                while ( i-- ) {
                                        option = options[ i ];
                                        if ( (option.selected = jQuery.inArray( jQuery(option).val(), values ) >= 0) ) {
                                                optionSet = true;
                                        }
                                }
-                               
+
                                // force browsers to behave consistently when non-matching value is set
                                if ( !optionSet ) {
                                        elem.selectedIndex = -1;

diff --git a/src/core.js b/src/core.js
index e8a3e0cd21ec404a52c5713f21129cd17e1484e8..c0a32762dff40988122fb536fec92079acaa2e8f 100644 (file)
--- a/src/core.js
+++ b/src/core.js
@@ -404,6 +404,7 @@ jQuery.extend({
        isArray: Array.isArray,
 
        isWindow: function( obj ) {
+               /* jshint eqeqeq: false */
                return obj != null && obj == obj.window;
        },
 

diff --git a/src/event.js b/src/event.js
index 4804e5a7d8dd1de4940de7968a78f89b9d18e451..33c8194c37616cc5dd752b4240187ebe6ed332fc 100644 (file)
--- a/src/event.js
+++ b/src/event.js
@@ -402,7 +402,9 @@ 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 */
 
                                // Don't process clicks on disabled elements (#6911, #8165, #11382, #11764)
                                if ( cur.disabled !== true || event.type !== "click" ) {

diff --git a/test/unit/attributes.js b/test/unit/attributes.js
index 5996ce15c88ed8b2461dab502a29db852836fef7..97686978092df4de85627b4065d6da6938336533 100644 (file)
--- a/test/unit/attributes.js
+++ b/test/unit/attributes.js
@@ -848,17 +848,17 @@ test( "val()", function() {
 
 test("val() with non-matching values on dropdown list", function() {
        expect( 3 );
-       
+
        jQuery("#select5").val( "" );
        equal( jQuery("#select5").val(), null, "Non-matching set on select-one" );
-       
+
        var select6 = jQuery("<select multiple id=\"select6\"><option value=\"1\">A</option><option value=\"2\">B</option></select>").appendTo("#form");
        jQuery(select6).val( "nothing" );
        equal( jQuery(select6).val(), null, "Non-matching set (single value) on select-multiple" );
-       
+
        jQuery(select6).val( ["nothing1", "nothing2"] );
        equal( jQuery(select6).val(), null, "Non-matching set (array of values) on select-multiple" );
-       
+
        select6.remove();
 });