Update jscs to 2.1.0

Change-Id: Ibba453510c8e15c3e915d28f7ecf7c296bca7894

Gruntfile.js

@@ -1,10 +1,10 @@
 /*jshint node:true */
 module.exports = function ( grunt ) {
+	var conf = grunt.file.readJSON( 'skin.json' );
 	grunt.loadNpmTasks( 'grunt-contrib-jshint' );
 	grunt.loadNpmTasks( 'grunt-jsonlint' );
 	grunt.loadNpmTasks( 'grunt-banana-checker' );
 	grunt.loadNpmTasks( 'grunt-jscs' );
-	var conf = grunt.file.readJSON( 'skin.json' );
 
 	grunt.initConfig( {
 		jshint: {
@@ -12,7 +12,9 @@ module.exports = function ( grunt ) {
 				jshintrc: true
 			},
 			all: [
-				'*.js'
+				'*.js',
+				'**/*.js',
+				'!node_modules/**'
 			]
 		},
 		jscs: {

collapsibleTabs.js

@@ -4,12 +4,13 @@
 ( function ( $ ) {
 	var rtl = $( 'html' ).attr( 'dir' ) === 'rtl';
 	$.fn.collapsibleTabs = function ( options ) {
+		// Merge options into the defaults
+		var settings = $.extend( {}, $.collapsibleTabs.defaults, options );
+
 		// return if the function is called on an empty jquery object
 		if ( !this.length ) {
 			return this;
 		}
-		// Merge options into the defaults
-		var settings = $.extend( {}, $.collapsibleTabs.defaults, options );
 
 		this.each( function () {
 			var $el = $( this );
@@ -160,8 +161,8 @@
 				.css( 'width', '1px' )
 				.data( 'collapsibleTabsSettings', data )
 				.animate( { width: expandedWidth + 'px' }, 'normal', function () {
-					$( this ).attr( 'style', 'display: block;' );
 					var data, expContainerSettings;
+					$( this ).attr( 'style', 'display: block;' );
 					data = $.collapsibleTabs.getSettings( $( this ) );
 					if ( data ) {
 						expContainerSettings = $.collapsibleTabs.getSettings( $( data.expandedContainer ) );

package.json

@@ -7,7 +7,7 @@
     "grunt-cli": "0.1.13",
     "grunt-contrib-jshint": "0.11.3",
     "grunt-banana-checker": "0.2.2",
-    "grunt-jscs": "1.8.0",
+    "grunt-jscs": "2.1.0",
     "grunt-jsonlint": "1.0.5"
   }
 }

vector.js

@@ -2,6 +2,14 @@
  * Vector-specific scripts
  */
 jQuery( function ( $ ) {
+
+	/**
+	 * Collapsible tabs
+	 */
+	var $cactions = $( '#p-cactions' ),
+		$tabContainer = $( '#p-views ul' ),
+		originalDropdownWidth = $cactions.width();
+
 	/**
 	 * Focus search input at the very end
 	 */
@@ -33,13 +41,6 @@ jQuery( function ( $ ) {
 			.attr( 'tabindex', '-1' );
 	} );
 
-	/**
-	 * Collapsible tabs
-	 */
-	var $cactions = $( '#p-cactions' ),
-		$tabContainer = $( '#p-views ul' ),
-		originalDropdownWidth = $cactions.width();
-
 	// Bind callback functions to animate our drop down menu in and out
 	// and then call the collapsibleTabs function on the menu
 	$tabContainer