Index: Gruntfile.js =================================================================== --- Gruntfile.js (revision 40904) +++ Gruntfile.js (working copy) @@ -1,23 +1,24 @@ -/* jshint node:true */ -module.exports = function(grunt) { - var path = require('path'), +/* global module, require, __dirname */ +module.exports = function( grunt ) { + var path = require( 'path' ), fs = require( 'fs' ), SOURCE_DIR = 'src/', BUILD_DIR = 'build/', - autoprefixer = require('autoprefixer'), + autoprefixer = require( 'autoprefixer' ), mediaConfig = {}, - mediaBuilds = ['audiovideo', 'grid', 'models', 'views']; + mediaBuilds = [ 'audiovideo', 'grid', 'models', 'views' ]; // Load tasks. - require('matchdep').filterDev(['grunt-*', '!grunt-legacy-util']).forEach( grunt.loadNpmTasks ); + require( 'matchdep' ).filterDev([ 'grunt-*', '!grunt-legacy-util' ]).forEach( grunt.loadNpmTasks ); + // Load legacy utils - grunt.util = require('grunt-legacy-util'); + grunt.util = require( 'grunt-legacy-util' ); - mediaBuilds.forEach( function ( build ) { + mediaBuilds.forEach( function( build ) { var path = SOURCE_DIR + 'wp-includes/js/media'; - mediaConfig[ build ] = { files : {} }; + mediaConfig[ build ] = { files: {} }; mediaConfig[ build ].files[ path + '-' + build + '.js' ] = [ path + '/' + build + '.manifest.js' ]; - } ); + }); // Project configuration. grunt.initConfig({ @@ -57,15 +58,15 @@ } }, clean: { - all: [BUILD_DIR], + all: [ BUILD_DIR ], dynamic: { dot: true, expand: true, cwd: BUILD_DIR, src: [] }, - tinymce: ['<%= concat.tinymce.dest %>'], - qunit: ['tests/qunit/compiled.html'] + tinymce: [ '<%= concat.tinymce.dest %>' ], + qunit: [ 'tests/qunit/compiled.html' ] }, copy: { files: { @@ -115,7 +116,7 @@ dest: BUILD_DIR + 'wp-admin/css/wp-admin.min.css' }, { - src: BUILD_DIR + 'wp-admin/css/wp-admin-rtl.css', + src: BUILD_DIR + 'wp-admin/css/wp-admin-rtl.css', dest: BUILD_DIR + 'wp-admin/css/wp-admin-rtl.min.css' } ] @@ -130,7 +131,7 @@ version = version.replace( /-[\d]{5}$/, '-' + grunt.template.today( 'yyyymmdd.HHMMss' ) ); /* jshint quotmark: true */ - return "$wp_version = '" + version + "';"; + return '$wp_version = \'' + version + '\';'; }); } }, @@ -149,10 +150,11 @@ dest: 'tests/qunit/compiled.html', options: { processContent: function( src ) { - return src.replace( /(\".+?\/)src(\/.+?)(?:.min)?(.js\")/g , function( match, $1, $2, $3 ) { + return src.replace( /(\".+?\/)src(\/.+?)(?:.min)?(.js\")/g, function( match, $1, $2, $3 ) { + // Don't add `.min` to files that don't have it. return $1 + 'build' + $2 + ( /jquery$/.test( $2 ) ? '' : '.min' ) + $3; - } ); + }); } } } @@ -164,7 +166,7 @@ cwd: SOURCE_DIR, dest: BUILD_DIR, ext: '.css', - src: ['wp-admin/css/colors/*/colors.scss'], + src: [ 'wp-admin/css/colors/*/colors.scss' ], options: { outputStyle: 'expanded' } @@ -209,6 +211,7 @@ }, rtlcss: { options: { + // rtlcss options opts: { clean: false, @@ -240,17 +243,17 @@ { expr: /content/im, action: function( prop, value ) { - if ( value === '"\\f141"' ) { // dashicons-arrow-left + if ( '"\\f141"' === value ) { // dashicons-arrow-left value = '"\\f139"'; - } else if ( value === '"\\f340"' ) { // dashicons-arrow-left-alt + } else if ( '"\\f340"' === value ) { // dashicons-arrow-left-alt value = '"\\f344"'; - } else if ( value === '"\\f341"' ) { // dashicons-arrow-left-alt2 + } else if ( '"\\f341"' === value ) { // dashicons-arrow-left-alt2 value = '"\\f345"'; - } else if ( value === '"\\f139"' ) { // dashicons-arrow-right + } else if ( '"\\f139"' === value ) { // dashicons-arrow-right value = '"\\f141"'; - } else if ( value === '"\\f344"' ) { // dashicons-arrow-right-alt + } else if ( '"\\f344"' === value ) { // dashicons-arrow-right-alt value = '"\\f340"'; - } else if ( value === '"\\f345"' ) { // dashicons-arrow-right-alt2 + } else if ( '"\\f345"' === value ) { // dashicons-arrow-right-alt2 value = '"\\f341"'; } return { prop: prop, value: value }; @@ -292,10 +295,67 @@ src: [] } }, + eslint: { + grunt: { + options: { + configFile: 'node_modules/eslint-config-wordpress/index.js' + }, + src: [ 'Gruntfile.js' ] + }, + core: { + options: { + configFile: 'node_modules/eslint-config-wordpress/index.js' + }, + cwd: SOURCE_DIR, + src: [ + 'wp-admin/js/*.js', + 'wp-includes/js/*.js', + + // Built scripts. + '!wp-includes/js/media-*', + + // WordPress scripts inside directories + 'wp-includes/js/jquery/jquery.table-hotkeys.js', + 'wp-includes/js/mediaelement/wp-mediaelement.js', + 'wp-includes/js/mediaelement/wp-playlist.js', + 'wp-includes/js/plupload/handlers.js', + 'wp-includes/js/plupload/wp-plupload.js', + 'wp-includes/js/tinymce/plugins/wordpress/plugin.js', + 'wp-includes/js/tinymce/plugins/wp*/plugin.js', + + // Third party scripts + '!wp-admin/js/farbtastic.js', + '!wp-includes/js/backbone*.js', + '!wp-includes/js/swfobject.js', + '!wp-includes/js/underscore*.js', + '!wp-includes/js/colorpicker.js', + '!wp-includes/js/hoverIntent.js', + '!wp-includes/js/json2.js', + '!wp-includes/js/tw-sack.js', + '!wp-includes/js/twemoji.js', + '!**/*.min.js' + ] + }, + themes: { + options: { + configFile: 'node_modules/eslint-config-wordpress/index.js' + }, + expand: true, + cwd: SOURCE_DIR + 'wp-content/themes', + src: [ + 'twenty*/**/*.js', + '!twenty{eleven,twelve,thirteen}/**', + + // Third party scripts + '!twenty{fourteen,fifteen,sixteen,seventeen}/**/html5.js', + '!twentyseventeen/assets/js/jquery.scrollTo.js' + ] + } + }, jshint: { - options: grunt.file.readJSON('.jshintrc'), + options: grunt.file.readJSON( '.jshintrc' ), grunt: { - src: ['Gruntfile.js'] + src: [ 'Gruntfile.js' ] }, tests: { src: [ @@ -303,7 +363,7 @@ '!tests/qunit/vendor/*', '!tests/qunit/editor/**' ], - options: grunt.file.readJSON('tests/qunit/.jshintrc') + options: grunt.file.readJSON( 'tests/qunit/.jshintrc' ) }, themes: { expand: true, @@ -311,6 +371,7 @@ src: [ 'twenty*/**/*.js', '!twenty{eleven,twelve,thirteen}/**', + // Third party scripts '!twenty{fourteen,fifteen,sixteen}/js/html5.js', '!twentyseventeen/assets/js/html5.js', @@ -331,8 +392,10 @@ src: [ 'wp-admin/js/**/*.js', 'wp-includes/js/*.js', + // Built scripts. '!wp-includes/js/media-*', + // WordPress scripts inside directories 'wp-includes/js/jquery/jquery.table-hotkeys.js', 'wp-includes/js/mediaelement/wp-mediaelement.js', @@ -341,6 +404,7 @@ 'wp-includes/js/plupload/wp-plupload.js', 'wp-includes/js/tinymce/plugins/wordpress/plugin.js', 'wp-includes/js/tinymce/plugins/wp*/plugin.js', + // Third party scripts '!wp-admin/js/farbtastic.js', '!wp-includes/js/backbone*.js', @@ -353,11 +417,13 @@ '!wp-includes/js/twemoji.js', '!**/*.min.js' ], + // Remove once other JSHint errors are resolved options: { curly: false, eqeqeq: false }, + // Limit JSHint's run to a single specified file: // // grunt jshint:core --file=filename.js @@ -367,7 +433,8 @@ // grunt jshint:core --file=path/to/filename.js // filter: function( filepath ) { - var index, file = grunt.option( 'file' ); + var index, +file = grunt.option( 'file' ); // Don't filter when no target file is specified if ( ! file ) { @@ -393,12 +460,14 @@ '**/*.js', '!**/*.min.js' ], + // Limit JSHint's run to a single specified plugin directory: // // grunt jshint:plugins --dir=foldername // filter: function( dirpath ) { - var index, dir = grunt.option( 'dir' ); + var index, +dir = grunt.option( 'dir' ); // Don't filter when no target folder is specified if ( ! dir ) { @@ -426,23 +495,23 @@ phpunit: { 'default': { cmd: 'phpunit', - args: ['--verbose', '-c', 'phpunit.xml.dist'] + args: [ '--verbose', '-c', 'phpunit.xml.dist' ] }, ajax: { cmd: 'phpunit', - args: ['--verbose', '-c', 'phpunit.xml.dist', '--group', 'ajax'] + args: [ '--verbose', '-c', 'phpunit.xml.dist', '--group', 'ajax' ] }, multisite: { cmd: 'phpunit', - args: ['--verbose', '-c', 'tests/phpunit/multisite.xml'] + args: [ '--verbose', '-c', 'tests/phpunit/multisite.xml' ] }, 'external-http': { cmd: 'phpunit', - args: ['--verbose', '-c', 'phpunit.xml.dist', '--group', 'external-http'] + args: [ '--verbose', '-c', 'phpunit.xml.dist', '--group', 'external-http' ] }, 'restapi-jsclient': { cmd: 'phpunit', - args: ['--verbose', '-c', 'phpunit.xml.dist', '--group', 'restapi-jsclient'] + args: [ '--verbose', '-c', 'phpunit.xml.dist', '--group', 'restapi-jsclient' ] } }, uglify: { @@ -488,7 +557,7 @@ cwd: SOURCE_DIR, dest: BUILD_DIR, ext: '.min.js', - src: ['wp-includes/js/wp-embed.js'] + src: [ 'wp-includes/js/wp-embed.js' ] }, media: { expand: true, @@ -504,6 +573,7 @@ }, jqueryui: { options: { + // Preserve comments that start with a bang. preserveComments: /^!/ }, @@ -511,7 +581,7 @@ cwd: SOURCE_DIR, dest: BUILD_DIR, ext: '.min.js', - src: ['wp-includes/js/jquery/ui/*.js'] + src: [ 'wp-includes/js/jquery/ui/*.js' ] }, bookmarklet: { options: { @@ -524,6 +594,7 @@ }, masonry: { options: { + // Preserve comments that start with a bang. preserveComments: /^!/ }, @@ -571,10 +642,10 @@ dest: BUILD_DIR + 'wp-includes/js/tinymce/wp-tinymce.js.gz' } }, - jsvalidate:{ + jsvalidate: { options: { globals: {}, - esprimaOptions:{}, + esprimaOptions: {}, verbose: false }, build: { @@ -612,10 +683,11 @@ files: [ SOURCE_DIR + '**', '!' + SOURCE_DIR + 'wp-includes/js/media/**', + // Ignore version control directories. '!' + SOURCE_DIR + '**/.{svn,git}/**' ], - tasks: ['clean:dynamic', 'copy:dynamic'], + tasks: [ 'clean:dynamic', 'copy:dynamic' ], options: { dot: true, spawn: false, @@ -626,15 +698,15 @@ files: 'Gruntfile.js' }, colors: { - files: [SOURCE_DIR + 'wp-admin/css/colors/**'], - tasks: ['sass:colors'] + files: [ SOURCE_DIR + 'wp-admin/css/colors/**' ], + tasks: [ 'sass:colors' ] }, rtl: { files: [ SOURCE_DIR + 'wp-admin/css/*.css', SOURCE_DIR + 'wp-includes/css/*.css' ], - tasks: ['rtlcss:dynamic'], + tasks: [ 'rtlcss:dynamic' ], options: { spawn: false, interval: 2000 @@ -645,13 +717,13 @@ 'tests/qunit/**', '!tests/qunit/editor/**' ], - tasks: ['qunit'] + tasks: [ 'qunit' ] } } }); // Allow builds to be minimal - if( grunt.option( 'minimal-copy' ) ) { + if ( grunt.option( 'minimal-copy' ) ) { var copyFilesOptions = grunt.config.get( 'copy.files.files' ); copyFilesOptions[0].src.push( '!wp-content/plugins/**' ); copyFilesOptions[0].src.push( '!wp-content/themes/!(twenty*)/**' ); @@ -662,10 +734,10 @@ // Register tasks. // RTL task. - grunt.registerTask('rtl', ['rtlcss:core', 'rtlcss:colors']); + grunt.registerTask( 'rtl', [ 'rtlcss:core', 'rtlcss:colors' ]); // Color schemes task. - grunt.registerTask('colors', ['sass:colors', 'postcss:colors']); + grunt.registerTask( 'colors', [ 'sass:colors', 'postcss:colors' ]); // JSHint task. grunt.registerTask( 'jshint:corejs', [ @@ -674,33 +746,33 @@ 'jshint:themes', 'jshint:core', 'jshint:media' - ] ); + ]); grunt.registerTask( 'restapi-jsclient', [ 'phpunit:restapi-jsclient', 'qunit:compiled' - ] ); + ]); grunt.renameTask( 'watch', '_watch' ); grunt.registerTask( 'watch', function() { - if ( ! this.args.length || this.args.indexOf( 'browserify' ) > -1 ) { + if ( ! this.args.length || -1 < this.args.indexOf( 'browserify' ) ) { grunt.config( 'browserify.options', { browserifyOptions: { debug: true }, watch: true - } ); + }); grunt.task.run( 'browserify' ); } grunt.task.run( '_' + this.nameArgs ); - } ); + }); grunt.registerTask( 'precommit:image', [ 'imagemin:core' - ] ); + ]); grunt.registerTask( 'precommit:js', [ 'browserify', @@ -708,15 +780,15 @@ 'uglify:bookmarklet', 'uglify:masonry', 'qunit:compiled' - ] ); + ]); grunt.registerTask( 'precommit:css', [ 'postcss:core' - ] ); + ]); grunt.registerTask( 'precommit:php', [ 'phpunit' - ] ); + ]); grunt.registerTask( 'precommit', 'Runs test and build tasks in preparation for a commit', function() { var done = this.async(); @@ -725,19 +797,23 @@ git: 'git status --short' }; - find( [ + find([ __dirname + '/.svn', __dirname + '/.git', path.dirname( __dirname ) + '/.svn' - ] ); + ]); function find( set ) { var dir; if ( set.length ) { fs.stat( dir = set.shift(), function( error ) { - error ? find( set ) : run( path.basename( dir ).substr( 1 ) ); - } ); + if ( error ) { + find( set ); + } else { + run( path.basename( dir ).substr( 1 ) ); + } + }); } else { grunt.fatal( 'This WordPress install is not under version control.' ); } @@ -746,13 +822,13 @@ function run( type ) { var command = map[ type ].split( ' ' ); - grunt.util.spawn( { + grunt.util.spawn({ cmd: command.shift(), args: command }, function( error, result, code ) { var taskList = []; - if ( code !== 0 ) { + if ( 0 !== code ) { grunt.fatal( 'The `' + map[ type ] + '` command returned a non-zero exit code.', code ); } @@ -768,11 +844,11 @@ return regex.test( result.stdout ); } - if ( [ 'package.json', 'Gruntfile.js' ].some( testPath ) ) { + if ([ 'package.json', 'Gruntfile.js' ].some( testPath ) ) { grunt.log.writeln( 'Configuration files modified. Running `prerelease`.' ); taskList.push( 'prerelease' ); } else { - if ( [ 'png', 'jpg', 'gif', 'jpeg' ].some( testExtension ) ) { + if ([ 'png', 'jpg', 'gif', 'jpeg' ].some( testExtension ) ) { grunt.log.writeln( 'Image files modified. Minifying.' ); taskList.push( 'precommit:image' ); } @@ -782,22 +858,22 @@ grunt.log.writeln( extension.toUpperCase() + ' files modified. ' + extension.toUpperCase() + ' tests will be run.' ); taskList.push( 'precommit:' + extension ); } - } ); + }); } grunt.task.run( taskList ); done(); - } ); + }); } - } ); + }); grunt.registerTask( 'copy:all', [ 'copy:files', 'copy:wp-admin-css-compat-rtl', 'copy:wp-admin-css-compat-min', 'copy:version' - ] ); + ]); grunt.registerTask( 'build', [ 'clean:all', @@ -817,62 +893,62 @@ 'includes:emoji', 'includes:embed', 'jsvalidate:build' - ] ); + ]); grunt.registerTask( 'prerelease', [ 'precommit:php', 'precommit:js', 'precommit:css', 'precommit:image' - ] ); + ]); // Testing tasks. - grunt.registerMultiTask('phpunit', 'Runs PHPUnit tests, including the ajax, external-http, and multisite tests.', function() { + grunt.registerMultiTask( 'phpunit', 'Runs PHPUnit tests, including the ajax, external-http, and multisite tests.', function() { grunt.util.spawn({ cmd: this.data.cmd, args: this.data.args, opts: {stdio: 'inherit'} - }, this.async()); + }, this.async() ); }); - grunt.registerTask('qunit:compiled', 'Runs QUnit tests on compiled as well as uncompiled scripts.', - ['build', 'copy:qunit', 'qunit']); + grunt.registerTask( 'qunit:compiled', 'Runs QUnit tests on compiled as well as uncompiled scripts.', + [ 'build', 'copy:qunit', 'qunit' ]); - grunt.registerTask('test', 'Runs all QUnit and PHPUnit tasks.', ['qunit:compiled', 'phpunit']); + grunt.registerTask( 'test', 'Runs all QUnit and PHPUnit tasks.', [ 'qunit:compiled', 'phpunit' ]); // Travis CI tasks. - grunt.registerTask('travis:js', 'Runs Javascript Travis CI tasks.', [ 'jshint:corejs', 'qunit:compiled' ]); - grunt.registerTask('travis:phpunit', 'Runs PHPUnit Travis CI tasks.', 'phpunit'); + grunt.registerTask( 'travis:js', 'Runs Javascript Travis CI tasks.', [ 'jshint:corejs', 'qunit:compiled' ]); + grunt.registerTask( 'travis:phpunit', 'Runs PHPUnit Travis CI tasks.', 'phpunit' ); // Patch task. - grunt.renameTask('patch_wordpress', 'patch'); + grunt.renameTask( 'patch_wordpress', 'patch' ); // Add an alias `apply` of the `patch` task name. - grunt.registerTask('apply', 'patch'); + grunt.registerTask( 'apply', 'patch' ); // Default task. - grunt.registerTask('default', ['build']); + grunt.registerTask( 'default', [ 'build' ]); /* * Automatically updates the `:dynamic` configurations * so that only the changed files are updated. */ - grunt.event.on('watch', function( action, filepath, target ) { + grunt.event.on( 'watch', function( action, filepath, target ) { var src; - if ( [ 'all', 'rtl', 'browserify' ].indexOf( target ) === -1 ) { + if ( -1 === [ 'all', 'rtl', 'browserify' ].indexOf( target ) ) { return; } src = [ path.relative( SOURCE_DIR, filepath ) ]; - if ( action === 'deleted' ) { - grunt.config( [ 'clean', 'dynamic', 'src' ], src ); + if ( 'deleted' === action ) { + grunt.config([ 'clean', 'dynamic', 'src' ], src ); } else { - grunt.config( [ 'copy', 'dynamic', 'src' ], src ); + grunt.config([ 'copy', 'dynamic', 'src' ], src ); - if ( target === 'rtl' ) { - grunt.config( [ 'rtlcss', 'dynamic', 'src' ], src ); + if ( 'rtl' === target ) { + grunt.config([ 'rtlcss', 'dynamic', 'src' ], src ); } } }); Index: package.json =================================================================== --- package.json (revision 40904) +++ package.json (working copy) @@ -13,6 +13,8 @@ "license": "GPL-2.0+", "devDependencies": { "autoprefixer": "^6.5.1", + "eslint": "~3.19.0", + "eslint-config-wordpress": "~2.0.0", "grunt": "~0.4.5", "grunt-browserify": "~5.0.0", "grunt-contrib-clean": "~1.0.0", @@ -25,6 +27,7 @@ "grunt-contrib-qunit": "^1.2.0", "grunt-contrib-uglify": "~2.0.0", "grunt-contrib-watch": "~1.0.0", + "grunt-eslint": "~19.0.0", "grunt-includes": "~0.5.1", "grunt-jsvalidate": "~0.2.2", "grunt-legacy-util": "^0.2.0", Index: src/wp-content/themes/twentyfourteen/js/slider.js =================================================================== --- src/wp-content/themes/twentyfourteen/js/slider.js (revision 40904) +++ src/wp-content/themes/twentyfourteen/js/slider.js (working copy) @@ -20,7 +20,7 @@ // Make variables public. slider.vars = $.extend( {}, $.featuredslider.defaults, options ); - namespace = slider.vars.namespace, + namespace = slider.vars.namespace; // Store a reference to the slider object. $.data( el, 'featuredslider', slider ); @@ -105,14 +105,12 @@ var type = 'control-paging', j = 1, item, - slide, i; slider.controlNavScaffold = $( '
    ' ); if ( slider.pagingCount > 1 ) { for ( i = 0; i < slider.pagingCount; i++ ) { - slide = slider.slides.eq( i ); item = '' + j + ''; slider.controlNavScaffold.append( '
  1. ' + item + '
    2. ' ); j++; @@ -120,7 +118,11 @@ } // CONTROLSCONTAINER - ( slider.controlsContainer ) ? $( slider.controlsContainer ).append( slider.controlNavScaffold ) : slider.append( slider.controlNavScaffold ); + if ( slider.controlsContainer ) { + $( slider.controlsContainer ).append( slider.controlNavScaffold ); + } else { + slider.append( slider.controlNavScaffold ); + } methods.controlNav.set(); methods.controlNav.active(); @@ -162,7 +164,11 @@ slider.controlNav.eq( pos ).closest( 'li' ).remove(); } methods.controlNav.set(); - ( slider.pagingCount > 1 && slider.pagingCount !== slider.controlNav.length ) ? slider.update( pos, action ) : methods.controlNav.active(); + if ( slider.pagingCount > 1 && slider.pagingCount !== slider.controlNav.length ) { + slider.update( pos, action ); + } else { + methods.controlNav.active(); + } } }, @@ -315,7 +321,7 @@ return; } - transX = -e.translationX, + transX = -e.translationX; transY = -e.translationY; // Accumulate translations. @@ -349,7 +355,7 @@ } if ( slider.animatingTo === slider.currentSlide && ! scrolling && dx !== null ) { - updateDx = dx, + updateDx = dx; target = ( updateDx > 0 ) ? slider.getTarget( 'next' ) : slider.getTarget( 'prev' ); slider.featureAnimate( target ); @@ -376,7 +382,11 @@ smoothHeight: function( dur ) { var $obj = slider.viewport; - ( dur ) ? $obj.animate( { 'height': slider.slides.eq( slider.animatingTo ).height() }, dur ) : $obj.height( slider.slides.eq( slider.animatingTo ).height() ); + if ( dur ) { + $obj.animate( { 'height': slider.slides.eq( slider.animatingTo ).height() }, dur ); + } else { + $obj.height( slider.slides.eq( slider.animatingTo ).height() ); + } }, setToClearWatchedEvent: function() {