Browse Source

Merge branch 'master' into esnext

Piotrek Koszuliński 10 years ago
parent
commit
2d2128935d

packages/ckeditor5-ui/dev/tasks/jscs-config.json → packages/ckeditor5-ui/.jscsrc


packages/ckeditor5-ui/dev/tasks/jshint-config.json → packages/ckeditor5-ui/.jshintrc


+ 1 - 1
packages/ckeditor5-ui/dev/tasks/jscs.js

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

+ 1 - 1
packages/ckeditor5-ui/dev/tasks/jshint.js

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