Permalink
Browse files

Merge remote-tracking branch 'boilerplate/master'

  • Loading branch information...
2 parents b4effd4 + 0a51788 commit 8cb575d9940f2f5fbfd3c751ddf8af9defba0331 @Reinmar Reinmar committed Sep 2, 2015
Showing with 27 additions and 2 deletions.
  1. 0 dev/tasks/jscs-config.json → .jscsrc
  2. +25 −0 .jshintrc
  3. +1 −1 dev/tasks/jscs.js
  4. +1 −1 dev/tasks/jshint.js
File renamed without changes.
View
@@ -0,0 +1,25 @@
+{
+ "browser": true,
+
+ "es3": true,
+ "immed": true,
+ "latedef": "nofunc",
+ "nonbsp": true,
+ "undef": true,
+ "unused": true,
+
+ "newcap": false,
+ "noempty": false,
+ "strict": false,
+
+ "boss": true,
+ "eqnull": true,
+ "evil": true,
+ "expr": true,
+ "funcscope": true,
+ "globalstrict": true,
+ "loopfunc": true,
+ "validthis": true,
+
+ "predef": [ "CKEDITOR", "assert", "arrayAssert", "bender", "JSON", "objectAssert", "resume", "sinon", "wait", "YUITest" ]
+}
View
@@ -7,7 +7,7 @@ var tools = require( './utils/tools' );
module.exports = function( grunt ) {
tools.setupMultitaskConfig( grunt, {
task: 'jscs',
- defaultOptions: grunt.file.readJSON( 'dev/tasks/jscs-config.json' ),
+ defaultOptions: grunt.file.readJSON( '.jscsrc' ),
addGitIgnore: 'excludeFiles',
targets: {
all: function() {
View
@@ -7,7 +7,7 @@ var tools = require( './utils/tools' );
module.exports = function( grunt ) {
tools.setupMultitaskConfig( grunt, {
task: 'jshint',
- defaultOptions: grunt.file.readJSON( 'dev/tasks/jshint-config.json' ),
+ defaultOptions: grunt.file.readJSON( '.jshintrc' ),
addGitIgnore: 'ignores',
targets: {
all: function() {

0 comments on commit 8cb575d

Please sign in to comment.