Skip to content

Commit 9697a89

Browse files
committed
Merge branch 'develop'
2 parents 55665e9 + 0c39c0d commit 9697a89

21 files changed

+484
-9833
lines changed

.editorconfig

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# EditorConfig is awesome: http://EditorConfig.org
2+
3+
# top-most EditorConfig file
4+
root = true
5+
6+
# Unix-style newlines with a newline ending every file
7+
[*]
8+
end_of_line = lf
9+
insert_final_newline = true
10+
11+
# Tab indentation (no size specified)
12+
[*.js]
13+
indent_style = tab
14+
15+
# Indentation override for all JS under lib directory
16+
[lib/**.js]
17+
indent_style = space
18+
indent_size = 2
19+
20+
# Matches the exact files either package.json or bower.json
21+
[{package.json,bower.json}]
22+
indent_style = space
23+
indent_size = 2

.gitignore

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
node_modules
2-
.c9revisions
3-
components
1+
/node_modules
2+
/bower_components

.jshintrc

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"curly" : true,
3+
"eqeqeq" : true,
4+
"immed" : true,
5+
"latedef" : true,
6+
"newcap" : true,
7+
"noarg" : true,
8+
"sub" : true,
9+
"undef" : true,
10+
"boss" : true,
11+
"eqnull" : true,
12+
"node" : true,
13+
"browser" : true,
14+
"globals" : {
15+
"it" : false,
16+
"xit" : false,
17+
"describe" : false,
18+
"xdescribe" : false,
19+
"beforeEach" : false,
20+
"afterEach" : false,
21+
"expect" : false,
22+
"spyOn" : false
23+
}
24+
}

Gruntfile.js

Lines changed: 55 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,67 @@
11
module.exports = function(grunt) {
22

3+
// Load all Grunt tasks.
4+
require('load-grunt-tasks')(grunt);
5+
6+
// Grunt configuration.
37
grunt.initConfig({
8+
49
pkg: grunt.file.readJSON('package.json'),
10+
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+
},
22+
523
uglify: {
6-
options: {
7-
banner: '/*! <%= pkg.name %> <%= pkg.version %> | <%= pkg.author %> | <%= grunt.template.today("yyyy-mm-dd") %> | <%= pkg.license %> */\n'
8-
},
9-
build: {
10-
src: 'src/jquery.checkboxes.js',
11-
dest: 'build/jquery.checkboxes.min.js'
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+
}
1233
}
1334
},
14-
bower: {
15-
install: {}
35+
36+
jshint: {
37+
all: {
38+
src: [
39+
'Gruntfile.js',
40+
'src/**/*.js',
41+
'tests/spec/**/*.js'
42+
],
43+
options: {
44+
jshintrc: true
45+
}
46+
}
47+
},
48+
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+
}
1660
}
17-
});
1861

19-
grunt.loadNpmTasks('grunt-contrib-uglify');
20-
grunt.loadNpmTasks('grunt-bower-task');
62+
});
2163

22-
grunt.registerTask('default', ['uglify']);
64+
grunt.registerTask('default', ['jshint', 'watch']);
65+
grunt.registerTask('build', ['jshint', 'jasmine', 'uglify']);
2366

2467
};

LICENSE

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
The MIT License (MIT)
2+
3+
Copyright (c) 2014 Rubens Mariuzzo
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

bower.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "checkboxes.js",
3-
"version": "1.0.4",
3+
"version": "1.0.5",
44
"homepage": "http://rmariuzzo.github.io/checkboxes.js/",
55
"authors": [
66
"Rubens Mariuzzo <rubens@mariuzzo.com>"
@@ -24,5 +24,9 @@
2424
"bower_components",
2525
"test",
2626
"tests"
27-
]
27+
],
28+
"devDependencies": {
29+
"jquery": "~2.1.1",
30+
"jasmine-jquery": "~2.0.3"
31+
}
2832
}

build/jquery.checkboxes.min.js

Lines changed: 0 additions & 2 deletions
This file was deleted.

dist/jquery.checkboxes-1.0.5.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.

0 commit comments

Comments
 (0)