Skip to content
Permalink
Browse files

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

(cherry picked from 4adde5d)

Conflicts:
	src/data.js
	src/effects.js
  • Loading branch information...
mgol authored and dmethvin committed Mar 13, 2013
1 parent 9eb838e commit 1205103a72db407bfbc0de3d9b78f1fd6a02520c
Showing with 15 additions and 10 deletions.
  1. +1 −1 package.json
  2. +3 −1 src/.jshintrc
  3. +2 −2 src/ajax.js
  4. +2 −2 src/attributes.js
  5. +1 −0 src/core.js
  6. +2 −0 src/event.js
  7. +4 −4 test/unit/attributes.js
@@ -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",
@@ -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,
@@ -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" ) ) )
);
}

@@ -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;
@@ -404,6 +404,7 @@ jQuery.extend({
isArray: Array.isArray,

isWindow: function( obj ) {
/* jshint eqeqeq: false */
return obj != null && obj == obj.window;
},

@@ -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" ) {
@@ -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();
});

0 comments on commit 1205103

Please sign in to comment.
You can’t perform that action at this time.