Commit 1205103a authored by Michał Gołębiowski's avatar Michał Gołębiowski Committed by Dave Methvin

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

(cherry picked from 4adde5d1)

Conflicts:
	src/data.js
	src/effects.js
parent 9eb838e4
...@@ -3,15 +3,17 @@ ...@@ -3,15 +3,17 @@
"expr": true, "expr": true,
"newcap": false, "newcap": false,
"quotmark": "double", "quotmark": "double",
"regexdash": true,
"trailing": true, "trailing": true,
"undef": true, "undef": true,
"unused": true, "unused": true,
"latedef": false,
"eqeqeq": true,
"maxerr": 100, "maxerr": 100,
"eqnull": true, "eqnull": true,
"evil": true, "evil": true,
"sub": true, "sub": true,
"boss": true,
"browser": true, "browser": true,
"wsh": true, "wsh": true,
......
...@@ -444,8 +444,8 @@ jQuery.extend({ ...@@ -444,8 +444,8 @@ jQuery.extend({
parts = rurl.exec( s.url.toLowerCase() ); parts = rurl.exec( s.url.toLowerCase() );
s.crossDomain = !!( parts && s.crossDomain = !!( parts &&
( parts[ 1 ] !== ajaxLocParts[ 1 ] || parts[ 2 ] !== ajaxLocParts[ 2 ] || ( parts[ 1 ] !== ajaxLocParts[ 1 ] || parts[ 2 ] !== ajaxLocParts[ 2 ] ||
( parts[ 3 ] || ( parts[ 1 ] === "http:" ? 80 : 443 ) ) != ( parts[ 3 ] || ( parts[ 1 ] === "http:" ? "80" : "443" ) ) !==
( ajaxLocParts[ 3 ] || ( ajaxLocParts[ 1 ] === "http:" ? 80 : 443 ) ) ) ( ajaxLocParts[ 3 ] || ( ajaxLocParts[ 1 ] === "http:" ? "80" : "443" ) ) )
); );
} }
......
...@@ -276,14 +276,14 @@ jQuery.extend({ ...@@ -276,14 +276,14 @@ jQuery.extend({
options = elem.options, options = elem.options,
values = jQuery.makeArray( value ), values = jQuery.makeArray( value ),
i = options.length; i = options.length;
while ( i-- ) { while ( i-- ) {
option = options[ i ]; option = options[ i ];
if ( (option.selected = jQuery.inArray( jQuery(option).val(), values ) >= 0) ) { if ( (option.selected = jQuery.inArray( jQuery(option).val(), values ) >= 0) ) {
optionSet = true; optionSet = true;
} }
} }
// force browsers to behave consistently when non-matching value is set // force browsers to behave consistently when non-matching value is set
if ( !optionSet ) { if ( !optionSet ) {
elem.selectedIndex = -1; elem.selectedIndex = -1;
......
...@@ -404,6 +404,7 @@ jQuery.extend({ ...@@ -404,6 +404,7 @@ jQuery.extend({
isArray: Array.isArray, isArray: Array.isArray,
isWindow: function( obj ) { isWindow: function( obj ) {
/* jshint eqeqeq: false */
return obj != null && obj == obj.window; return obj != null && obj == obj.window;
}, },
......
...@@ -402,7 +402,9 @@ jQuery.event = { ...@@ -402,7 +402,9 @@ jQuery.event = {
// Avoid non-left-click bubbling in Firefox (#3861) // Avoid non-left-click bubbling in Firefox (#3861)
if ( delegateCount && cur.nodeType && (!event.button || event.type !== "click") ) { if ( delegateCount && cur.nodeType && (!event.button || event.type !== "click") ) {
/* jshint eqeqeq: false */
for ( ; cur != this; cur = cur.parentNode || this ) { for ( ; cur != this; cur = cur.parentNode || this ) {
/* jshint eqeqeq: true */
// Don't process clicks on disabled elements (#6911, #8165, #11382, #11764) // Don't process clicks on disabled elements (#6911, #8165, #11382, #11764)
if ( cur.disabled !== true || event.type !== "click" ) { if ( cur.disabled !== true || event.type !== "click" ) {
......
...@@ -848,17 +848,17 @@ test( "val()", function() { ...@@ -848,17 +848,17 @@ test( "val()", function() {
test("val() with non-matching values on dropdown list", function() { test("val() with non-matching values on dropdown list", function() {
expect( 3 ); expect( 3 );
jQuery("#select5").val( "" ); jQuery("#select5").val( "" );
equal( jQuery("#select5").val(), null, "Non-matching set on select-one" ); 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"); var select6 = jQuery("<select multiple id=\"select6\"><option value=\"1\">A</option><option value=\"2\">B</option></select>").appendTo("#form");
jQuery(select6).val( "nothing" ); jQuery(select6).val( "nothing" );
equal( jQuery(select6).val(), null, "Non-matching set (single value) on select-multiple" ); equal( jQuery(select6).val(), null, "Non-matching set (single value) on select-multiple" );
jQuery(select6).val( ["nothing1", "nothing2"] ); jQuery(select6).val( ["nothing1", "nothing2"] );
equal( jQuery(select6).val(), null, "Non-matching set (array of values) on select-multiple" ); equal( jQuery(select6).val(), null, "Non-matching set (array of values) on select-multiple" );
select6.remove(); select6.remove();
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment