Skip to content

Commit

Permalink
fix indenation & add editorconfig
Browse files Browse the repository at this point in the history
  • Loading branch information
jdewit committed Jun 2, 2014
1 parent 95a4d6c commit 5df07ef
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 21 deletions.
20 changes: 20 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# EditorConfig helps developers define and maintain consistent
# coding styles between different editors and IDEs
# editorconfig.org

root = true

[*]

# Change these settings to your own preference
indent_style = space
indent_size = 2

# We recommend you to keep these unchanged
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[*.md]
trim_trailing_whitespace = false
42 changes: 21 additions & 21 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module.exports = function (grunt) {
grunt.loadNpmTasks('grunt-karma');

grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),
pkg: grunt.file.readJSON('package.json'),
karma: {
options: {
configFile: 'karma.conf.js'
Expand All @@ -32,13 +32,13 @@ module.exports = function (grunt) {
server: {
}
},
jshint: {
jshint: {
src: {
options: {
jshintrc: '.jshintrc'
},
files: {
src: ['src/*.js']
src: ['src/*.js', 'Gruntfile.js']
}
},
test: {
Expand All @@ -49,7 +49,7 @@ module.exports = function (grunt) {
src: ['test/*.js']
}
}
},
},
watch: {
options: {
livereload: true
Expand All @@ -65,23 +65,23 @@ module.exports = function (grunt) {
npm: false
}
},
uglify: {
dist: {
options: {
banner: ['/*',
' * <%= pkg.name %>',
' * <%= pkg.homepage %>',
' *',
' * @version: <%= pkg.version %>',
' * @license: <%= pkg.license %>',
' */\n'
].join('\n')
},
files: {
'dist/angular-debounce.min.js': ['src/angular-debounce.js']
}
}
}
uglify: {
dist: {
options: {
banner: ['/*',
' * <%= pkg.name %>',
' * <%= pkg.homepage %>',
' *',
' * @version: <%= pkg.version %>',
' * @license: <%= pkg.license %>',
' */\n'
].join('\n')
},
files: {
'dist/angular-debounce.min.js': ['src/angular-debounce.js']
}
}
}
});

grunt.registerTask('default', ['jshint', 'karma:ci', 'uglify']);
Expand Down

0 comments on commit 5df07ef

Please sign in to comment.