Skip to content

Commit faba8cf

Browse files
committed
Merge pull request #12 from rmariuzzo/develop
Version 1.0.6
2 parents 58b18ff + fcb7234 commit faba8cf

File tree

6 files changed

+250
-206
lines changed

6 files changed

+250
-206
lines changed

.editorconfig

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,8 @@ root = true
88
end_of_line = lf
99
insert_final_newline = true
1010

11-
# Tab indentation (no size specified)
11+
# Tab indentation.
1212
[*.js]
13-
indent_style = tab
14-
15-
# Indentation override for all JS under lib directory
16-
[lib/**.js]
1713
indent_style = space
1814
indent_size = 2
1915

Gruntfile.js

Lines changed: 60 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,73 @@
1-
module.exports = function(grunt) {
1+
'use strict';
22

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

6-
// Grunt configuration.
7-
grunt.initConfig({
5+
// Load all Grunt tasks.
6+
require('load-grunt-tasks')(grunt);
87

9-
pkg: grunt.file.readJSON('package.json'),
8+
// Grunt configuration.
9+
grunt.initConfig({
1010

11-
watch: {
12-
scripts: {
13-
files: [
14-
'Gruntfile.js',
15-
'src/**/*.js',
16-
'tests/specs/**/*.js',
17-
'!.grunt'
18-
],
19-
tasks: ['jshint', 'jasmine']
20-
}
21-
},
11+
pkg: grunt.file.readJSON('package.json'),
2212

23-
uglify: {
24-
all: {
25-
files: {
26-
'dist/jquery.checkboxes-<%= pkg.version %>.min.js': ['src/jquery.checkboxes.js']
27-
},
28-
options: {
29-
banner: '/*! checkboxes.js v<%= pkg.version %> | ' +
30-
'(c) 2013, <%= grunt.template.today("yyyy") %> Rubens Mariuzzo | ' +
31-
'http://github.com/rmariuzzo/checkboxes.js/LICENSE */',
32-
}
33-
}
34-
},
13+
clean: ['dist'],
14+
15+
watch: {
16+
scripts: {
17+
files: [
18+
'Gruntfile.js',
19+
'src/**/*.js',
20+
'tests/specs/**/*.js',
21+
'!.grunt'
22+
],
23+
tasks: ['jshint', 'jasmine']
24+
}
25+
},
3526

36-
jshint: {
37-
all: {
38-
src: [
39-
'Gruntfile.js',
40-
'src/**/*.js',
41-
'tests/spec/**/*.js'
42-
],
43-
options: {
44-
jshintrc: true
45-
}
46-
}
27+
uglify: {
28+
all: {
29+
files: {
30+
'dist/jquery.checkboxes-<%= pkg.version %>.min.js': ['src/jquery.checkboxes.js']
4731
},
32+
options: {
33+
banner: '/*! checkboxes.js v<%= pkg.version %> | ' +
34+
'(c) 2013, <%= grunt.template.today("yyyy") %> Rubens Mariuzzo | ' +
35+
'http://github.com/rmariuzzo/checkboxes.js/LICENSE */',
36+
}
37+
}
38+
},
39+
40+
jshint: {
41+
all: {
42+
src: [
43+
'Gruntfile.js',
44+
'src/**/*.js',
45+
'tests/spec/**/*.js'
46+
],
47+
options: {
48+
jshintrc: true
49+
}
50+
}
51+
},
4852

49-
jasmine: {
50-
all: {
51-
src: 'src/**/*.js',
52-
options: {
53-
specs: 'tests/specs/*_spec.js',
54-
vendor: [
55-
'bower_components/jquery/dist/jquery.min.js',
56-
'bower_components/jasmine-jquery/lib/jasmine-jquery.js'
57-
]
58-
}
59-
}
53+
jasmine: {
54+
all: {
55+
src: 'src/**/*.js',
56+
options: {
57+
specs: 'tests/specs/*_spec.js',
58+
vendor: [
59+
'bower_components/jquery/dist/jquery.min.js',
60+
'bower_components/jasmine-jquery/lib/jasmine-jquery.js'
61+
]
6062
}
63+
}
64+
}
6165

62-
});
66+
});
6367

64-
grunt.registerTask('default', ['jshint', 'watch']);
65-
grunt.registerTask('build', ['jshint', 'jasmine', 'uglify']);
66-
grunt.registerTask('test', ['jasmine']);
67-
grunt.registerTask('travis', ['jshint', 'jasmine']);
68+
grunt.registerTask('default', ['jshint', 'watch']);
69+
grunt.registerTask('build', ['clean', 'jshint', 'jasmine', 'uglify']);
70+
grunt.registerTask('test', ['jasmine']);
71+
grunt.registerTask('travis', ['jshint', 'jasmine']);
6872

6973
};

dist/jquery.checkboxes-1.0.5.min.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

dist/jquery.checkboxes-1.0.6.min.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "checkboxes.js",
3-
"version": "1.0.5",
3+
"version": "1.0.6",
44
"homepage": "https://github.com/rmariuzzo/checkboxes.js",
55
"keywords": "checkbox checkboxes",
66
"license": "MIT",
@@ -11,6 +11,7 @@
1111
},
1212
"devDependencies": {
1313
"grunt": "~0.4.1",
14+
"grunt-contrib-clean": "^0.6.0",
1415
"grunt-contrib-jasmine": "~0.6.5",
1516
"grunt-contrib-jshint": "~0.10.0",
1617
"grunt-contrib-uglify": "~0.2.2",

0 commit comments

Comments
 (0)