Build: update grunt-jscs-checker and pass with the new rules

Conflicts: build/tasks/build.js src/ajax/xhr.js src/attributes/classes.js src/attributes/prop.js src/attributes/val.js src/core/init.js src/core/ready.js src/css.js src/css/curCSS.js src/css/defaultDisplay.js src/data.js src/data/var/dataPriv.js src/data/var/dataUser.js src/dimensions.js src/effects.js src/event.js src/manipulation.js src/offset.js src/queue.js src/selector-native.js test/data/testrunner.js
jquery · Jul 17, 2014 · 91e06e9 · 91e06e9
1 parent 511eb15
commit 91e06e9
Show file tree

Hide file tree

Showing 41 changed files with 379 additions and 168 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -19,7 +19,7 @@ module.exports = function( grunt ) {
 	grunt.initConfig({
 		pkg: grunt.file.readJSON( "package.json" ),
 		dst: readOptionalJSON( "dist/.destination.json" ),
-		compare_size: {
+		"compare_size": {
 			files: [ "dist/jquery.js", "dist/jquery.min.js" ],
 			options: {
 				compress: {
@@ -92,13 +92,31 @@ module.exports = function( grunt ) {
 			src: "src/**/*.js",
 			gruntfile: "Gruntfile.js",
 
-			// Right know, check only test helpers
-			test: [ "test/data/testrunner.js", "test/data/testinit.js" ],
-			release: "build/*.js",
+			// Right now, check only test helpers
+			test: [ "test/data/testrunner.js" ],
+			release: [ "build/*.js", "!build/release-notes.js" ],
 			tasks: "build/tasks/*.js"
 		},
 		testswarm: {
-			tests: "ajax attributes callbacks core css data deferred dimensions effects event manipulation offset queue selector serialize support traversing".split( " " )
+			tests: [
+				"ajax",
+				"attributes",
+				"callbacks",
+				"core",
+				"css",
+				"data",
+				"deferred",
+				"dimensions",
+				"effects",
+				"event",
+				"manipulation",
+				"offset",
+				"queue",
+				"selector",
+				"serialize",
+				"support",
+				"traversing"
+			]
 		},
 		watch: {
 			files: [ "<%= jshint.all.src %>" ],
@@ -115,13 +133,13 @@ module.exports = function( grunt ) {
 					sourceMappingURL: "jquery.min.map",
 					report: "min",
 					beautify: {
-						ascii_only: true
+						"ascii_only": true
 					},
 					banner: "/*! jQuery v<%= pkg.version %> | " +
 						"(c) 2005, <%= grunt.template.today('yyyy') %> jQuery Foundation, Inc. | " +
 						"jquery.org/license */",
 					compress: {
-						hoist_funs: false,
+						"hoist_funs": false,
 						loops: false,
 						unused: false
 					}

diff --git a/build/release-notes.js b/build/release-notes.js
@@ -16,7 +16,8 @@ http.request({
 	host: "bugs.jquery.com",
 	port: 80,
 	method: "GET",
-	path: "/query?status=closed&resolution=fixed&max=400&component=!web&order=component&milestone=" + version
+	path: "/query?status=closed&resolution=fixed&max=400&" +
+		"component=!web&order=component&milestone=" + version
 }, function( res ) {
 	var data = [];
 

diff --git a/build/release.js b/build/release.js
@@ -88,7 +88,9 @@ module.exports = function( Release ) {
 
 		var archiver = require( "archiver" )( "zip" ),
 			md5file = cdnFolder + "/" + cdn + "-md5.txt",
-			output = fs.createWriteStream( cdnFolder + "/" + cdn + "-jquery-" + Release.newVersion + ".zip" );
+			output = fs.createWriteStream(
+				cdnFolder + "/" + cdn + "-jquery-" + Release.newVersion + ".zip"
+			);
 
 		output.on( "error", function( err ) {
 			throw err;

diff --git a/build/tasks/build.js b/build/tasks/build.js
@@ -1,6 +1,7 @@
 /**
  * Special concat/build task to handle various jQuery build requirements
- * Concats AMD modules, removes their definitions, and includes/excludes specified modules
+ * Concats AMD modules, removes their definitions,
+ * and includes/excludes specified modules
  */
 
 module.exports = function( grunt ) {
@@ -35,7 +36,8 @@ module.exports = function( grunt ) {
 	/**
 	 * Strip all definitions generated by requirejs
 	 * Convert "var" modules to var declarations
-	 * "var module" means the module only contains a return statement that should be converted to a var declaration
+	 * "var module" means the module only contains a return
+	 * statement that should be converted to a var declaration
 	 * This is indicated by including the file in any "var" folder
 	 * @param {String} name
 	 * @param {String} path
@@ -98,7 +100,8 @@ module.exports = function( grunt ) {
 
 	grunt.registerMultiTask(
 		"build",
-		"Concatenate source, remove sub AMD definitions, (include/exclude modules with +/- flags), embed date/version",
+		"Concatenate source, remove sub AMD definitions, " +
+			"(include/exclude modules with +/- flags), embed date/version",
 	function() {
 		var flag, index,
 			done = this.async(),
@@ -113,15 +116,18 @@ module.exports = function( grunt ) {
 			/**
 			 * Recursively calls the excluder to remove on all modules in the list
 			 * @param {Array} list
-			 * @param {String} [prepend] Prepend this to the module name. Indicates we're walking a directory
+			 * @param {String} [prepend] Prepend this to the module name.
+			 *  Indicates we're walking a directory
 			 */
 			excludeList = function( list, prepend ) {
 				if ( list ) {
 					prepend = prepend ? prepend + "/" : "";
 					list.forEach(function( module ) {
 						// Exclude var modules as well
 						if ( module === "var" ) {
-							excludeList( fs.readdirSync( srcFolder + prepend + module ), prepend + module );
+							excludeList(
+								fs.readdirSync( srcFolder + prepend + module ), prepend + module
+							);
 							return;
 						}
 						if ( prepend ) {
@@ -143,7 +149,9 @@ module.exports = function( grunt ) {
 			},
 			/**
 			 * Adds the specified module to the excluded or included list, depending on the flag
-			 * @param {String} flag A module path relative to the src directory starting with + or - to indicate whether it should included or excluded
+			 * @param {String} flag A module path relative to
+			 *  the src directory starting with + or - to indicate
+			 *  whether it should included or excluded
 			 */
 			excluder = function( flag ) {
 				var m = /^(\+|\-|)([\w\/-]+)$/.exec( flag ),
@@ -162,7 +170,7 @@ module.exports = function( grunt ) {
 							// It's fine if the directory is not there
 							try {
 								excludeList( fs.readdirSync( srcFolder + module ), module );
-							} catch( e ) {
+							} catch ( e ) {
 								grunt.verbose.writeln( e );
 							}
 						}
@@ -192,8 +200,10 @@ module.exports = function( grunt ) {
 		//  *                  none (implicit exclude)
 		//  *:*                all (implicit include)
 		//  *:*:-css           all except css and dependents (explicit > implicit)
-		//  *:*:-css:+effects  same (excludes effects because explicit include is trumped by explicit exclude of dependency)
-		//  *:+effects         none except effects and its dependencies (explicit include trumps implicit exclude of dependency)
+		//  *:*:-css:+effects  same (excludes effects because explicit include is
+		//                     trumped by explicit exclude of dependency)
+		//  *:+effects         none except effects and its dependencies
+		//                     (explicit include trumps implicit exclude of dependency)
 		delete flags[ "*" ];
 		for ( flag in flags ) {
 			excluder( flag );
@@ -239,7 +249,9 @@ module.exports = function( grunt ) {
 		// Turn off opt-in if necessary
 		if ( !optIn ) {
 			// Overwrite the default inclusions with the explicit ones provided
-			config.rawText.jquery = "define([" + (included.length ? included.join(",") : "") + "]);";
+			config.rawText.jquery = "define([" +
+				(included.length ? included.join(",") : "") +
+			"]);";
 		}
 
 		// Trace dependencies and concatenate files

diff --git a/package.json b/package.json
@@ -39,7 +39,7 @@
     "grunt-contrib-uglify": "0.5.0",
     "grunt-contrib-watch": "0.6.1",
     "grunt-git-authors": "1.2.0",
-    "grunt-jscs-checker": "0.4.1",
+    "grunt-jscs-checker": "0.6.1",
     "grunt-jsonlint": "1.0.4",
     "grunt-npmcopy": "0.1.0",
     "gzip-js": "0.3.2",

diff --git a/src/ajax.js b/src/ajax.js
@@ -49,7 +49,7 @@ var
 // a field from window.location if document.domain has been set
 try {
 	ajaxLocation = location.href;
-} catch( e ) {
+} catch ( e ) {
 	// Use the href attribute of an A element
 	// since IE will modify it given document.location
 	ajaxLocation = document.createElement( "a" );
@@ -103,7 +103,9 @@ function inspectPrefiltersOrTransports( structure, options, originalOptions, jqX
 		inspected[ dataType ] = true;
 		jQuery.each( structure[ dataType ] || [], function( _, prefilterOrFactory ) {
 			var dataTypeOrTransport = prefilterOrFactory( options, originalOptions, jqXHR );
-			if ( typeof dataTypeOrTransport === "string" && !seekingTransport && !inspected[ dataTypeOrTransport ] ) {
+			if ( typeof dataTypeOrTransport === "string" &&
+				!seekingTransport && !inspected[ dataTypeOrTransport ] ) {
+
 				options.dataTypes.unshift( dataTypeOrTransport );
 				inspect( dataTypeOrTransport );
 				return false;
@@ -275,7 +277,10 @@ function ajaxConvert( s, response, jqXHR, isSuccess ) {
 						try {
 							response = conv( response );
 						} catch ( e ) {
-							return { state: "parsererror", error: conv ? e : "No conversion from " + prev + " to " + current };
+							return {
+								state: "parsererror",
+								error: conv ? e : "No conversion from " + prev + " to " + current
+							};
 						}
 					}
 				}
@@ -412,9 +417,10 @@ jQuery.extend({
 			// Callbacks context
 			callbackContext = s.context || s,
 			// Context for global events is callbackContext if it is a DOM node or jQuery collection
-			globalEventContext = s.context && ( callbackContext.nodeType || callbackContext.jquery ) ?
-				jQuery( callbackContext ) :
-				jQuery.event,
+			globalEventContext = s.context &&
+				( callbackContext.nodeType || callbackContext.jquery ) ?
+					jQuery( callbackContext ) :
+					jQuery.event,
 			// Deferreds
 			deferred = jQuery.Deferred(),
 			completeDeferred = jQuery.Callbacks("once memory"),
@@ -506,7 +512,9 @@ jQuery.extend({
 		// Add protocol if not provided (#5866: IE7 issue with protocol-less urls)
 		// Handle falsy url in the settings object (#10093: consistency with old signature)
 		// We also use the url parameter if available
-		s.url = ( ( url || s.url || ajaxLocation ) + "" ).replace( rhash, "" ).replace( rprotocol, ajaxLocParts[ 1 ] + "//" );
+		s.url = ( ( url || s.url || ajaxLocation ) + "" )
+			.replace( rhash, "" )
+			.replace( rprotocol, ajaxLocParts[ 1 ] + "//" );
 
 		// Alias method option to type as per ticket #12004
 		s.type = options.method || options.type || s.method || s.type;
@@ -597,7 +605,8 @@ jQuery.extend({
 		jqXHR.setRequestHeader(
 			"Accept",
 			s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[0] ] ?
-				s.accepts[ s.dataTypes[0] ] + ( s.dataTypes[ 0 ] !== "*" ? ", " + allTypes + "; q=0.01" : "" ) :
+				s.accepts[ s.dataTypes[0] ] +
+					( s.dataTypes[ 0 ] !== "*" ? ", " + allTypes + "; q=0.01" : "" ) :
 				s.accepts[ "*" ]
 		);
 
@@ -607,7 +616,9 @@ jQuery.extend({
 		}
 
 		// Allow custom headers/mimetypes and early abort
-		if ( s.beforeSend && ( s.beforeSend.call( callbackContext, jqXHR, s ) === false || state === 2 ) ) {
+		if ( s.beforeSend &&
+			( s.beforeSend.call( callbackContext, jqXHR, s ) === false || state === 2 ) ) {
+
 			// Abort if not done already and return
 			return jqXHR.abort();
 		}

diff --git a/src/ajax/jsonp.js b/src/ajax/jsonp.js
@@ -24,7 +24,9 @@ jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
 	var callbackName, overwritten, responseContainer,
 		jsonProp = s.jsonp !== false && ( rjsonp.test( s.url ) ?
 			"url" :
-			typeof s.data === "string" && !( s.contentType || "" ).indexOf("application/x-www-form-urlencoded") && rjsonp.test( s.data ) && "data"
+			typeof s.data === "string" &&
+				!( s.contentType || "" ).indexOf("application/x-www-form-urlencoded") &&
+				rjsonp.test( s.data ) && "data"
 		);
 
 	// Handle iff the expected data type is "jsonp" or we have a parameter to set

diff --git a/src/ajax/parseXML.js b/src/ajax/parseXML.js
@@ -17,7 +17,7 @@ jQuery.parseXML = function( data ) {
 			xml.async = "false";
 			xml.loadXML( data );
 		}
-	} catch( e ) {
+	} catch ( e ) {
 		xml = undefined;
 	}
 	if ( !xml || !xml.documentElement || xml.getElementsByTagName( "parsererror" ).length ) {

diff --git a/src/ajax/script.js b/src/ajax/script.js
@@ -6,7 +6,8 @@ define([
 // Install script dataType
 jQuery.ajaxSetup({
 	accepts: {
-		script: "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"
+		script: "text/javascript, application/javascript, " +
+			"application/ecmascript, application/x-ecmascript"
 	},
 	contents: {
 		script: /(?:java|ecma)script/

diff --git a/src/ajax/xhr.js b/src/ajax/xhr.js
@@ -60,7 +60,13 @@ if ( xhrSupported ) {
 						id = ++xhrId;
 
 					// Open the socket
-					xhr.open( options.type, options.url, options.async, options.username, options.password );
+					xhr.open(
+						options.type,
+						options.url,
+						options.async,
+						options.username,
+						options.password
+					);
 
 					// Apply custom fields if provided
 					if ( options.xhrFields ) {
@@ -132,7 +138,7 @@ if ( xhrSupported ) {
 								// statusText for faulty cross-domain requests
 								try {
 									statusText = xhr.statusText;
-								} catch( e ) {
+								} catch ( e ) {
 									// We normalize with Webkit giving an empty statusText
 									statusText = "";
 								}
@@ -184,13 +190,13 @@ if ( xhrSupported ) {
 function createStandardXHR() {
 	try {
 		return new window.XMLHttpRequest();
-	} catch( e ) {}
+	} catch ( e ) {}
 }
 
 function createActiveXHR() {
 	try {
 		return new window.ActiveXObject( "Microsoft.XMLHTTP" );
-	} catch( e ) {}
+	} catch ( e ) {}
 }
 
 });
diff --git a/src/attributes/attr.js b/src/attributes/attr.js
@@ -54,7 +54,9 @@ jQuery.extend({
 			if ( value === null ) {
 				jQuery.removeAttr( elem, name );
 
-			} else if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) {
+			} else if ( hooks && "set" in hooks &&
+				(ret = hooks.set( elem, value, name )) !== undefined ) {
+
 				return ret;
 
 			} else {

diff --git a/src/attributes/classes.js b/src/attributes/classes.js
@@ -103,7 +103,9 @@ jQuery.fn.extend({
 
 		if ( jQuery.isFunction( value ) ) {
 			return this.each(function( i ) {
-				jQuery( this ).toggleClass( value.call(this, i, this.className, stateVal), stateVal );
+				jQuery( this ).toggleClass(
+					value.call(this, i, this.className, stateVal), stateVal
+				);
 			});
 		}
 
@@ -135,7 +137,9 @@ jQuery.fn.extend({
 				// then remove the whole classname (if there was one, the above saved it).
 				// Otherwise bring back whatever was previously saved (if anything),
 				// falling back to the empty string if nothing was stored.
-				this.className = this.className || value === false ? "" : jQuery._data( this, "__className__" ) || "";
+				this.className = this.className || value === false ?
+					"" :
+					jQuery._data( this, "__className__" ) || "";
 			}
 		});
 	},
@@ -145,7 +149,9 @@ jQuery.fn.extend({
 			i = 0,
 			l = this.length;
 		for ( ; i < l; i++ ) {
-			if ( this[i].nodeType === 1 && (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) >= 0 ) {
+			if ( this[i].nodeType === 1 &&
+				(" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) >= 0 ) {
+
 				return true;
 			}
 		}