Skip to content

Commit 06e2c18

Browse files
lejeunerenardlejeunerenard
committed
Merge branch 'development' for v0.9.1 release
2 parents 7e8cded + 344b4a6 commit 06e2c18

File tree

10 files changed

+1077
-1041
lines changed

10 files changed

+1077
-1041
lines changed

‎.editorconfig‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# This file is for unifying the coding style for different editors and IDEs
2+
# editorconfig.org
3+
4+
root = true
5+
6+
[*]
7+
indent_style = space
8+
indent_size = 4
9+
end_of_line = lf
10+
charset = utf-8
11+
trim_trailing_whitespace = true
12+
insert_final_newline = true

‎.jshintrc‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"boss": true,
3+
"curly": true,
4+
"eqeqeq": true,
5+
"eqnull": true,
6+
"expr": true,
7+
"immed": true,
8+
"noarg": true,
9+
"onevar": true,
10+
"quotmark": "single",
11+
"smarttabs": true,
12+
"trailing": true,
13+
"unused": true,
14+
"node": true,
15+
"multistr": true,
16+
"onevar": false
17+
}

‎Gruntfile.js‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@ module.exports = function(grunt) {
1212
' * License: <%= pkg.license %>\n' +
1313
' */\n\n'
1414
},
15-
// jshint config
15+
// config for jshint
1616
jshint: {
1717
options: {
18-
eqeqeq: true,
19-
trailing: true
18+
jshintrc: true
2019
},
2120
target: {
2221
src: ['src/**/*.js']
@@ -56,12 +55,18 @@ module.exports = function(grunt) {
5655
'dist/jquery.listable.min.js': ['dist/jquery.listable.js']
5756
}
5857
}
58+
},
59+
// watch for changes to source
60+
watch: {
61+
files: ['src/*'],
62+
tasks: ['default']
5963
}
6064
});
6165
grunt.loadNpmTasks('grunt-contrib-jshint');
6266
grunt.loadNpmTasks('grunt-contrib-concat');
6367
grunt.loadNpmTasks('grunt-contrib-uglify');
6468
grunt.loadNpmTasks('grunt-contrib-copy');
65-
grunt.registerTask('default', ['concat', 'copy', 'uglify']);
69+
grunt.loadNpmTasks('grunt-contrib-watch');
70+
grunt.registerTask('default', ['jshint', 'concat', 'copy', 'uglify']);
6671
grunt.registerTask('test', ['jshint']);
6772
};

‎README.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,3 +67,10 @@ For more examples, check out the [examples folder](https://github.com/lejeuneren
6767

6868
## Documentation
6969
Find more detailed documentation under the "Documentation" section at [Listable's website](http://listable.highgatecross.com).
70+
71+
## Contribute
72+
73+
```sh
74+
npm i
75+
grunt watch
76+
```

‎dist/jquery.listable.js‎

Lines changed: 460 additions & 463 deletions
Large diffs are not rendered by default.

‎dist/jquery.listable.min.js‎

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

‎dist/listable.css‎

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,90 +1,90 @@
11
/* ========================================
2-
Listable
2+
Listable
33
======================================== */
44
.listable {
5-
list-style: none;
6-
min-width: 100px;
7-
min-height: 20px;
5+
list-style: none;
6+
min-width: 100px;
7+
min-height: 20px;
88
}
99
/* ----------------------------------------
10-
Placeholder
10+
Placeholder
1111
---------------------------------------- */
1212
.place_holder {
13-
background: #666;
14-
width: 100%;
15-
height: 20px;
16-
webkit-border-radius: 3px;
17-
moz-border-radius: 3px;
18-
-o-border-radius: 3px;
19-
border-radius: 3px;
20-
opacity: 0.25;
21-
/*--line placeholder
22-
border: 1px solid #222;
23-
--*/
24-
float: left;
13+
background: #666;
14+
width: 100%;
15+
height: 20px;
16+
webkit-border-radius: 3px;
17+
moz-border-radius: 3px;
18+
-o-border-radius: 3px;
19+
border-radius: 3px;
20+
opacity: 0.25;
21+
/*--line placeholder
22+
border: 1px solid #222;
23+
--*/
24+
float: left;
2525
}
2626
.ui-sortable-helper {
27-
background: #fff;
28-
width: 100%;
29-
height: 100%;
30-
padding: 0 0 14px 5px;
31-
webkit-border-radius: 3px;
32-
moz-border-radius: 3px;
33-
-o-border-radius: 3px;
34-
border-radius: 3px;
35-
opacity: .75;
36-
webkit-box-shadow: 3px 3px 3px #8b8b8b;
37-
moz-box-shadow: 3px 3px 3px #8b8b8b;
38-
-o-box-shadow: 3px 3px 3px #8b8b8b;
39-
box-shadow: 3px 3px 3px #8b8b8b;
27+
background: #fff;
28+
width: 100%;
29+
height: 100%;
30+
padding: 0 0 14px 5px;
31+
webkit-border-radius: 3px;
32+
moz-border-radius: 3px;
33+
-o-border-radius: 3px;
34+
border-radius: 3px;
35+
opacity: .75;
36+
webkit-box-shadow: 3px 3px 3px #8b8b8b;
37+
moz-box-shadow: 3px 3px 3px #8b8b8b;
38+
-o-box-shadow: 3px 3px 3px #8b8b8b;
39+
box-shadow: 3px 3px 3px #8b8b8b;
4040
}
4141

4242
/* ----------------------------------------
43-
List items
43+
List items
4444
---------------------------------------- */
4545
.field_divider {
46-
float: left;
47-
width: 100%;
48-
cursor: pointer;
46+
float: left;
47+
width: 100%;
48+
cursor: pointer;
4949
}
5050
.form_field {
51-
clear: both;
52-
cursor: move;
51+
clear: both;
52+
cursor: move;
5353
}
5454
/* -- Buttons -- */
5555
.listable li {
56-
list-style: none;
56+
list-style: none;
5757
}
5858
.listable-el-class {
59-
float: left;
59+
float: left;
6060
}
6161
.listable_item_buttons {
62-
display: inline;
62+
display: inline;
6363
}
6464
.listable_item_buttons li {
65-
display: inline;
66-
margin: 0;
65+
display: inline;
66+
margin: 0;
6767
}
6868

6969

7070
/* ----------------------------------------
71-
Controls
71+
Controls
7272
---------------------------------------- */
73-
.listable-controls {
74-
position: absolute;
75-
display: none;
76-
padding: 10px;
77-
background-color: #F0EAE1;
78-
-moz-border-radius: 3px 3px 3px 3px;
79-
border-radius: 3px;
80-
-moz-box-shadow: 0 1px 2px #666666;
81-
box-shadow: 0 1px 2px #666;
82-
margin-left: -233px;
73+
.listable-controls {
74+
position: absolute;
75+
display: none;
76+
padding: 10px;
77+
background-color: #F0EAE1;
78+
-moz-border-radius: 3px 3px 3px 3px;
79+
border-radius: 3px;
80+
-moz-box-shadow: 0 1px 2px #666666;
81+
box-shadow: 0 1px 2px #666;
82+
margin-left: -233px;
8383
}
8484

8585
/* ----------------------------------------
86-
Form Vault
86+
Form Vault
8787
---------------------------------------- */
8888
.mask {
89-
display: none;
89+
display: none;
9090
}

‎package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,10 @@
2626
"readmeFilename": "README.md",
2727
"devDependencies": {
2828
"grunt": "~0.4.1",
29-
"grunt-contrib-jshint": "~0.7.0",
3029
"grunt-contrib-concat": "~0.3.0",
30+
"grunt-contrib-copy": "~0.4.1",
31+
"grunt-contrib-jshint": "~0.7.0",
3132
"grunt-contrib-uglify": "~0.2.4",
32-
"grunt-contrib-copy": "~0.4.1"
33+
"grunt-contrib-watch": "^0.6.1"
3334
}
3435
}

0 commit comments

Comments
 (0)