Skip to content

Commit

Permalink
Merge pull request #12 from rmariuzzo/develop
Browse files Browse the repository at this point in the history
Version 1.0.6
  • Loading branch information
rmariuzzo committed Dec 12, 2014
2 parents 58b18ff + fcb7234 commit faba8cf
Show file tree
Hide file tree
Showing 6 changed files with 250 additions and 206 deletions.
6 changes: 1 addition & 5 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,8 @@ root = true
end_of_line = lf
insert_final_newline = true

# Tab indentation (no size specified)
# Tab indentation.
[*.js]
indent_style = tab

# Indentation override for all JS under lib directory
[lib/**.js]
indent_style = space
indent_size = 2

Expand Down
116 changes: 60 additions & 56 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -1,69 +1,73 @@
module.exports = function(grunt) {
'use strict';

// Load all Grunt tasks.
require('load-grunt-tasks')(grunt);
module.exports = function (grunt) {

// Grunt configuration.
grunt.initConfig({
// Load all Grunt tasks.
require('load-grunt-tasks')(grunt);

pkg: grunt.file.readJSON('package.json'),
// Grunt configuration.
grunt.initConfig({

watch: {
scripts: {
files: [
'Gruntfile.js',
'src/**/*.js',
'tests/specs/**/*.js',
'!.grunt'
],
tasks: ['jshint', 'jasmine']
}
},
pkg: grunt.file.readJSON('package.json'),

uglify: {
all: {
files: {
'dist/jquery.checkboxes-<%= pkg.version %>.min.js': ['src/jquery.checkboxes.js']
},
options: {
banner: '/*! checkboxes.js v<%= pkg.version %> | ' +
'(c) 2013, <%= grunt.template.today("yyyy") %> Rubens Mariuzzo | ' +
'http://github.com/rmariuzzo/checkboxes.js/LICENSE */',
}
}
},
clean: ['dist'],

watch: {
scripts: {
files: [
'Gruntfile.js',
'src/**/*.js',
'tests/specs/**/*.js',
'!.grunt'
],
tasks: ['jshint', 'jasmine']
}
},

jshint: {
all: {
src: [
'Gruntfile.js',
'src/**/*.js',
'tests/spec/**/*.js'
],
options: {
jshintrc: true
}
}
uglify: {
all: {
files: {
'dist/jquery.checkboxes-<%= pkg.version %>.min.js': ['src/jquery.checkboxes.js']
},
options: {
banner: '/*! checkboxes.js v<%= pkg.version %> | ' +
'(c) 2013, <%= grunt.template.today("yyyy") %> Rubens Mariuzzo | ' +
'http://github.com/rmariuzzo/checkboxes.js/LICENSE */',
}
}
},

jshint: {
all: {
src: [
'Gruntfile.js',
'src/**/*.js',
'tests/spec/**/*.js'
],
options: {
jshintrc: true
}
}
},

jasmine: {
all: {
src: 'src/**/*.js',
options: {
specs: 'tests/specs/*_spec.js',
vendor: [
'bower_components/jquery/dist/jquery.min.js',
'bower_components/jasmine-jquery/lib/jasmine-jquery.js'
]
}
}
jasmine: {
all: {
src: 'src/**/*.js',
options: {
specs: 'tests/specs/*_spec.js',
vendor: [
'bower_components/jquery/dist/jquery.min.js',
'bower_components/jasmine-jquery/lib/jasmine-jquery.js'
]
}
}
}

});
});

grunt.registerTask('default', ['jshint', 'watch']);
grunt.registerTask('build', ['jshint', 'jasmine', 'uglify']);
grunt.registerTask('test', ['jasmine']);
grunt.registerTask('travis', ['jshint', 'jasmine']);
grunt.registerTask('default', ['jshint', 'watch']);
grunt.registerTask('build', ['clean', 'jshint', 'jasmine', 'uglify']);
grunt.registerTask('test', ['jasmine']);
grunt.registerTask('travis', ['jshint', 'jasmine']);

};
1 change: 0 additions & 1 deletion dist/jquery.checkboxes-1.0.5.min.js

This file was deleted.

1 change: 1 addition & 0 deletions dist/jquery.checkboxes-1.0.6.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "checkboxes.js",
"version": "1.0.5",
"version": "1.0.6",
"homepage": "https://github.com/rmariuzzo/checkboxes.js",
"keywords": "checkbox checkboxes",
"license": "MIT",
Expand All @@ -11,6 +11,7 @@
},
"devDependencies": {
"grunt": "~0.4.1",
"grunt-contrib-clean": "^0.6.0",
"grunt-contrib-jasmine": "~0.6.5",
"grunt-contrib-jshint": "~0.10.0",
"grunt-contrib-uglify": "~0.2.2",
Expand Down
Loading

0 comments on commit faba8cf

Please sign in to comment.