Skip to content

Commit e3ede5b

Browse files
radiolipsradiolips
committed
Merge branch 'develop'
2 parents 8c1cb7e + 66339a5 commit e3ede5b

31 files changed

+4520
-4394
lines changed

‎.gitignore‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
dist
2-
node_modules
1+
*.log
2+
*.tgz
3+
.npmrc
34
bower_components
45
coverage
5-
*.log
6+
dist
7+
node_modules

‎.jscsrc‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
2-
"preset": "node-style-guide",
3-
"validateIndentation": 4,
4-
"maximumLineLength": 120,
5-
"jsDoc": {
6-
"checkAnnotations": {
7-
"preset": "jsdoc3",
8-
"extra": {
9-
"preserve": true
10-
}
11-
}
12-
},
13-
"requireCamelCaseOrUpperCaseIdentifiers": true,
14-
"validateLineBreaks": false,
15-
"requireTrailingComma": false,
16-
"disallowTrailingWhitespace": true,
17-
"requireCapitalizedComments": false,
18-
"excludeFiles": ["dist/*.js", "demo/*", "spec/*"]
2+
"preset": "node-style-guide",
3+
"validateIndentation": 2,
4+
"maximumLineLength": 180,
5+
"jsDoc": {
6+
"checkAnnotations": {
7+
"preset": "jsdoc3",
8+
"extra": {
9+
"preserve": true
10+
}
11+
}
12+
},
13+
"requireCamelCaseOrUpperCaseIdentifiers": true,
14+
"validateLineBreaks": false,
15+
"requireTrailingComma": false,
16+
"disallowTrailingWhitespace": true,
17+
"requireCapitalizedComments": false,
18+
"excludeFiles": ["dist/*.js", "demo/*", "spec/*"]
1919
}

‎.npmignore‎

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,30 @@
1-
node_modules
2-
bower_components
3-
coverage
4-
*.log
5-
spec
6-
freelancer
7-
.jscsrc
1+
# Source & demo
2+
src/
3+
demo/
4+
spec/
5+
6+
# dependencies
7+
yarn.lock
8+
9+
# Configuration
810
.gitignore
9-
README.md
10-
PULL_REQUEST_TEMPLATE.md
11-
ISSUE_TEMPLATE.md
12-
protractor.conf.js
11+
.jscsrc
12+
.npmignore
1313
.travis.yml
1414
Gruntfile.js
15+
ISSUE_TEMPLATE.md
16+
PULL_REQUEST_TEMPLATE.md
17+
bower.json
18+
freelancer
1519
karma.conf.js
20+
protractor.conf.js
21+
22+
## From .gitignore:
23+
*.log
24+
*.tgz
25+
bower_components
26+
coverage/
27+
node_modules/
28+
29+
# files that might have secrets in them
30+
.npmrc

‎Gruntfile.js‎

Lines changed: 95 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -1,112 +1,112 @@
11
// jscs:disable requireCamelCaseOrUpperCaseIdentifiers
22
module.exports = function(grunt) {
3-
grunt.loadNpmTasks('grunt-sass');
4-
grunt.loadNpmTasks('grunt-contrib-cssmin');
5-
grunt.loadNpmTasks('grunt-contrib-copy');
6-
grunt.loadNpmTasks('grunt-contrib-uglify');
7-
grunt.loadNpmTasks('grunt-contrib-jshint');
8-
grunt.loadNpmTasks('grunt-jscs');
9-
grunt.loadNpmTasks('grunt-contrib-watch');
10-
grunt.loadNpmTasks('grunt-protractor-runner');
11-
grunt.loadNpmTasks('grunt-contrib-connect');
12-
grunt.loadNpmTasks('grunt-protractor-webdriver');
3+
grunt.loadNpmTasks('grunt-sass');
4+
grunt.loadNpmTasks('grunt-contrib-cssmin');
5+
grunt.loadNpmTasks('grunt-contrib-copy');
6+
grunt.loadNpmTasks('grunt-contrib-uglify');
7+
grunt.loadNpmTasks('grunt-contrib-jshint');
8+
grunt.loadNpmTasks('grunt-jscs');
9+
grunt.loadNpmTasks('grunt-contrib-watch');
10+
grunt.loadNpmTasks('grunt-protractor-runner');
11+
grunt.loadNpmTasks('grunt-contrib-connect');
12+
grunt.loadNpmTasks('grunt-protractor-webdriver');
1313

14-
grunt.initConfig({
15-
sass: {
16-
options: {
17-
outputStyle: 'expanded'
18-
},
19-
dist: {
20-
files: {
21-
'dist/gridstack.css': 'src/gridstack.scss',
22-
'dist/gridstack-extra.css': 'src/gridstack-extra.scss'
23-
}
24-
}
25-
},
14+
grunt.initConfig({
15+
sass: {
16+
options: {
17+
outputStyle: 'expanded'
18+
},
19+
dist: {
20+
files: {
21+
'dist/gridstack.css': 'src/gridstack.scss',
22+
'dist/gridstack-extra.css': 'src/gridstack-extra.scss'
23+
}
24+
}
25+
},
2626

27-
cssmin: {
28-
dist: {
29-
files: {
30-
'dist/gridstack.min.css': ['dist/gridstack.css'],
31-
'dist/gridstack-extra.min.css': ['dist/gridstack-extra.css']
32-
}
33-
}
34-
},
27+
cssmin: {
28+
dist: {
29+
files: {
30+
'dist/gridstack.min.css': ['dist/gridstack.css'],
31+
'dist/gridstack-extra.min.css': ['dist/gridstack-extra.css']
32+
}
33+
}
34+
},
3535

36-
copy: {
37-
dist: {
38-
files: {
39-
'dist/gridstack.js': ['src/gridstack.js'],
40-
'dist/gridstack.jQueryUI.js': ['src/gridstack.jQueryUI.js'],
41-
}
42-
}
43-
},
36+
copy: {
37+
dist: {
38+
files: {
39+
'dist/gridstack.js': ['src/gridstack.js'],
40+
'dist/gridstack.jQueryUI.js': ['src/gridstack.jQueryUI.js'],
41+
}
42+
}
43+
},
4444

45-
uglify: {
46-
options: {
47-
sourceMap: true,
48-
sourceMapName: 'dist/gridstack.min.map',
49-
preserveComments: 'some'
50-
},
51-
dist: {
52-
files: {
53-
'dist/gridstack.min.js': ['src/gridstack.js'],
54-
'dist/gridstack.jQueryUI.min.js': ['src/gridstack.jQueryUI.js'],
55-
'dist/gridstack.all.js': ['src/gridstack.js', 'src/gridstack.jQueryUI.js']
56-
}
57-
}
58-
},
45+
uglify: {
46+
options: {
47+
sourceMap: true,
48+
sourceMapName: 'dist/gridstack.min.map',
49+
preserveComments: 'some'
50+
},
51+
dist: {
52+
files: {
53+
'dist/gridstack.min.js': ['src/gridstack.js'],
54+
'dist/gridstack.jQueryUI.min.js': ['src/gridstack.jQueryUI.js'],
55+
'dist/gridstack.all.js': ['src/gridstack.js', 'src/gridstack.jQueryUI.js']
56+
}
57+
}
58+
},
5959

60-
jshint: {
61-
all: ['src/*.js']
62-
},
60+
jshint: {
61+
all: ['src/*.js']
62+
},
6363

64-
jscs: {
65-
all: ['*.js', 'src/*.js', ],
66-
},
64+
jscs: {
65+
all: ['*.js', 'src/*.js', ],
66+
},
6767

68-
watch: {
69-
scripts: {
70-
files: ['src/*.js'],
71-
tasks: ['uglify', 'copy'],
72-
options: {
73-
},
74-
},
75-
styles: {
76-
files: ['src/*.scss'],
77-
tasks: ['sass', 'cssmin'],
78-
options: {
79-
},
80-
}
68+
watch: {
69+
scripts: {
70+
files: ['src/*.js'],
71+
tasks: ['uglify', 'copy'],
72+
options: {
8173
},
82-
83-
protractor: {
84-
options: {
85-
configFile: 'protractor.conf.js',
86-
},
87-
all: {}
74+
},
75+
styles: {
76+
files: ['src/*.scss'],
77+
tasks: ['sass', 'cssmin'],
78+
options: {
8879
},
80+
}
81+
},
82+
83+
protractor: {
84+
options: {
85+
configFile: 'protractor.conf.js',
86+
},
87+
all: {}
88+
},
8989

90-
connect: {
91-
all: {
92-
options: {
93-
port: 8080,
94-
hostname: 'localhost',
95-
base: '.',
96-
},
97-
},
90+
connect: {
91+
all: {
92+
options: {
93+
port: 8080,
94+
hostname: 'localhost',
95+
base: '.',
9896
},
97+
},
98+
},
9999

100-
protractor_webdriver: {
101-
all: {
102-
options: {
103-
command: 'webdriver-manager start',
104-
}
105-
}
100+
protractor_webdriver: {
101+
all: {
102+
options: {
103+
command: 'webdriver-manager start',
106104
}
107-
});
105+
}
106+
}
107+
});
108108

109-
grunt.registerTask('lint', ['jshint', 'jscs']);
110-
grunt.registerTask('default', ['sass', 'cssmin', 'jshint', 'jscs', 'copy', 'uglify']);
111-
grunt.registerTask('e2e-test', ['connect', 'protractor_webdriver', 'protractor']);
109+
grunt.registerTask('lint', ['jshint', 'jscs']);
110+
grunt.registerTask('default', ['sass', 'cssmin', 'jshint', 'jscs', 'copy', 'uglify']);
111+
grunt.registerTask('e2e-test', ['connect', 'protractor_webdriver', 'protractor']);
112112
};

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2014-2017 Pavel Reznikov, Dylan Weiss
3+
Copyright (c) 2014-2019 Dylan Weiss, Alain Dumesny, Pavel Reznikov
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)