Skip to content

Commit 087a4ad

Browse files
committed
Add semi at the end of dist file
1 parent ef63177 commit 087a4ad

11 files changed

+146
-130
lines changed

Diff for: .prettierrc

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"semi": false,
3+
"singleQuote": true,
4+
"trailingComma": "es5"
5+
}

Diff for: CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# 6.4.2 (2017-11-30)
2+
## Bug fix
3+
- Add a semicolon at the end of the `dist/rzslider.js` file. It avoids errors when people concat this file with other libs without using the minified version.
4+
15
# 6.4.1 (2017-11-17)
26
## Bug fix
37
- Options: react to changes of options of Function type (#590)

Diff for: Gruntfile.js

+100-79
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,47 @@
11
module.exports = function(grunt) {
2-
var banner = '/*! <%= pkg.name %> - v<%= pkg.version %> - \n' +
2+
var banner =
3+
'/*! <%= pkg.name %> - v<%= pkg.version %> - \n' +
34
' (c) <%= pkg.author %> - \n' +
45
' <%= pkg.repository.url %> - \n' +
56
' <%= grunt.template.today("yyyy-mm-dd") %> */\n',
6-
minBanner = banner.replace(/\n/g, '') + '\n';
7+
minBanner = banner.replace(/\n/g, '') + '\n'
78

89
// Project configuration.
910
grunt.initConfig({
10-
1111
pkg: grunt.file.readJSON('package.json'),
1212

1313
minBanner: minBanner,
1414

1515
recess: {
1616
options: {
17-
compile: true
17+
compile: true,
1818
},
1919

2020
slider: {
2121
src: ['src/rzslider.less'],
22-
dest: 'dist/rzslider.css'
22+
dest: 'dist/rzslider.css',
2323
},
2424

2525
min: {
2626
options: {
2727
compress: true,
28-
banner: '<%= minBanner %>'
28+
banner: '<%= minBanner %>',
2929
},
3030
src: ['dist/rzslider.css'],
31-
dest: 'dist/rzslider.min.css'
32-
}
31+
dest: 'dist/rzslider.min.css',
32+
},
3333
},
3434

3535
uglify: {
3636
options: {
3737
report: 'min',
38-
banner: '<%= minBanner %>'
38+
banner: '<%= minBanner %>',
3939
},
4040
rzslider: {
4141
files: {
42-
'dist/rzslider.min.js': [
43-
'dist/rzslider.js'
44-
]
45-
}
46-
}
42+
'dist/rzslider.min.js': ['dist/rzslider.js'],
43+
},
44+
},
4745
},
4846

4947
ngtemplates: {
@@ -59,133 +57,156 @@ module.exports = function(grunt) {
5957
removeEmptyAttributes: true,
6058
removeRedundantAttributes: true,
6159
removeScriptTypeAttributes: true,
62-
removeStyleLinkTypeAttributes: true
60+
removeStyleLinkTypeAttributes: true,
6361
},
6462
module: 'rzModule',
6563
url: function(url) {
66-
return url.replace('src/', '');
64+
return url.replace('src/', '')
6765
},
6866
bootstrap: function(module, script) {
69-
return 'module.run(function($templateCache) {\n' + script + '\n});';
70-
}
71-
}
72-
}
67+
return 'module.run(function($templateCache) {\n' + script + '\n});'
68+
},
69+
},
70+
},
7371
},
7472

7573
replace: {
7674
dist: {
7775
options: {
78-
patterns: [{
79-
match: /\/\*templateReplacement\*\//,
80-
replacement: '<%= grunt.file.read("temp/templates.js") %>'
81-
}]
76+
patterns: [
77+
{
78+
match: /\/\*templateReplacement\*\//,
79+
replacement: '<%= grunt.file.read("temp/templates.js") %>',
80+
},
81+
],
8282
},
83-
files: [{
84-
expand: true,
85-
flatten: true,
86-
src: ['src/rzslider.js', 'rzslider.d.ts'],
87-
dest: 'dist/'
88-
}]
89-
}
83+
files: [
84+
{
85+
expand: true,
86+
flatten: true,
87+
src: ['src/rzslider.js', 'rzslider.d.ts'],
88+
dest: 'dist/',
89+
},
90+
],
91+
},
9092
},
9193

9294
concat: {
9395
options: {
9496
stripBanners: true,
95-
banner: banner
97+
banner: banner,
98+
footer: ';', // to prevent error when people concat the file and don't use the min version
9699
},
97100
js: {
98101
src: ['dist/rzslider.js'],
99-
dest: 'dist/rzslider.js'
102+
dest: 'dist/rzslider.js',
100103
},
101104
css: {
102105
src: ['dist/rzslider.css'],
103-
dest: 'dist/rzslider.css'
104-
}
106+
dest: 'dist/rzslider.css',
107+
},
105108
},
106109

107110
ngAnnotate: {
108111
options: {
109-
singleQuotes: true
112+
singleQuotes: true,
110113
},
111114
rzslider: {
112-
files: [{
113-
'dist/rzslider.js': 'dist/rzslider.js'
114-
}, {
115-
expand: true,
116-
src: ['dist/rzslider.js']
117-
}]
118-
}
115+
files: [
116+
{
117+
'dist/rzslider.js': 'dist/rzslider.js',
118+
},
119+
{
120+
expand: true,
121+
src: ['dist/rzslider.js'],
122+
},
123+
],
124+
},
119125
},
120126
watch: {
121127
all: {
122128
files: ['dist/*', 'demo/*'],
123129
options: {
124-
livereload: true
125-
}
130+
livereload: true,
131+
},
126132
},
127133
js: {
128134
files: ['src/*.js', 'src/*.html'],
129-
tasks: ['js']
135+
tasks: ['js'],
130136
},
131137
less: {
132138
files: ['src/*.less'],
133-
tasks: ['css']
139+
tasks: ['css'],
134140
},
135141
test: {
136142
files: ['src/*.js', 'tests/specs/**/*.js'],
137-
tasks: ['test']
138-
}
143+
tasks: ['test'],
144+
},
139145
},
140146
serve: {
141147
options: {
142-
port: 9000
143-
}
148+
port: 9000,
149+
},
144150
},
145151
karma: {
146152
unit: {
147153
configFile: 'karma.conf.js',
148-
singleRun: true
149-
}
154+
singleRun: true,
155+
},
150156
},
151157

152158
copy: {
153159
copyToSass: {
154160
files: [
155-
{expand: false, src: ['dist/rzslider.css'], dest: 'dist/rzslider.scss'},
156-
]
157-
}
161+
{
162+
expand: false,
163+
src: ['dist/rzslider.css'],
164+
dest: 'dist/rzslider.scss',
165+
},
166+
],
167+
},
158168
},
159169
postcss: {
160170
options: {
161171
map: true,
162172
processors: [
163173
require('autoprefixer')({
164-
browsers: ['> 1%', 'last 2 versions', 'Firefox ESR']
165-
})
166-
]
174+
browsers: ['> 1%', 'last 2 versions', 'Firefox ESR'],
175+
}),
176+
],
167177
},
168178
dist: {
169-
src: 'dist/rzslider.css'
170-
}
171-
}
172-
});
179+
src: 'dist/rzslider.css',
180+
},
181+
},
182+
})
173183

174-
grunt.loadNpmTasks('grunt-contrib-uglify');
175-
grunt.loadNpmTasks('grunt-recess');
176-
grunt.loadNpmTasks('grunt-angular-templates');
177-
grunt.loadNpmTasks('grunt-replace');
178-
grunt.loadNpmTasks('grunt-contrib-concat');
179-
grunt.loadNpmTasks('grunt-ng-annotate');
180-
grunt.loadNpmTasks('grunt-contrib-watch');
181-
grunt.loadNpmTasks('grunt-serve');
182-
grunt.loadNpmTasks('grunt-karma');
183-
grunt.loadNpmTasks('grunt-contrib-copy');
184-
grunt.loadNpmTasks('grunt-postcss');
184+
grunt.loadNpmTasks('grunt-contrib-uglify')
185+
grunt.loadNpmTasks('grunt-recess')
186+
grunt.loadNpmTasks('grunt-angular-templates')
187+
grunt.loadNpmTasks('grunt-replace')
188+
grunt.loadNpmTasks('grunt-contrib-concat')
189+
grunt.loadNpmTasks('grunt-ng-annotate')
190+
grunt.loadNpmTasks('grunt-contrib-watch')
191+
grunt.loadNpmTasks('grunt-serve')
192+
grunt.loadNpmTasks('grunt-karma')
193+
grunt.loadNpmTasks('grunt-contrib-copy')
194+
grunt.loadNpmTasks('grunt-postcss')
185195

186-
grunt.registerTask('default', ['css', 'js']);
187-
grunt.registerTask('test', ['karma']);
196+
grunt.registerTask('default', ['css', 'js'])
197+
grunt.registerTask('test', ['karma'])
188198

189-
grunt.registerTask('css', ['recess', 'concat:css', 'postcss:dist', 'copy:copyToSass']);
190-
grunt.registerTask('js', ['ngtemplates', 'replace', 'concat:js', 'ngAnnotate', 'uglify']);
191-
};
199+
grunt.registerTask('css', [
200+
'recess',
201+
'concat:css',
202+
'postcss:dist',
203+
'copy:copyToSass',
204+
])
205+
grunt.registerTask('js', [
206+
'ngtemplates',
207+
'replace',
208+
'concat:js',
209+
'ngAnnotate',
210+
'uglify',
211+
])
212+
}

Diff for: bower.json

+4-16
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,17 @@
11
{
22
"name": "angularjs-slider",
3-
"version": "6.4.0",
3+
"version": "6.4.2",
44
"homepage": "https://github.com/angular-slider/angularjs-slider",
55
"authors": [
66
"Rafal Zajac <[email protected]>",
77
"Valentin Hervieu <[email protected]>",
88
"Jussi Saarivirta <[email protected]>"
99
],
1010
"description": "AngularJS slider directive with no external dependencies. Mobile friendly!",
11-
"main": [
12-
"dist/rzslider.js",
13-
"dist/rzslider.css"
14-
],
15-
"keywords": [
16-
"angularjs",
17-
"slider"
18-
],
11+
"main": ["dist/rzslider.js", "dist/rzslider.css"],
12+
"keywords": ["angularjs", "slider"],
1913
"license": "MIT",
20-
"ignore": [
21-
"**/.*",
22-
"node_modules",
23-
"bower_components",
24-
"test",
25-
"tests"
26-
],
14+
"ignore": ["**/.*", "node_modules", "bower_components", "test", "tests"],
2715
"devDependencies": {
2816
"angular": "~1.4.0"
2917
}

Diff for: dist/rzslider.css

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: dist/rzslider.js

+12-11
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*! angularjs-slider - v6.4.1 -
22
(c) Rafal Zajac <[email protected]>, Valentin Hervieu <[email protected]>, Jussi Saarivirta <[email protected]>, Angelin Sirbu <[email protected]> -
33
https://github.com/angular-slider/angularjs-slider -
4-
2017-11-17 */
4+
2017-11-30 */
55
/*jslint unparam: true */
66
/*global angular: false, console: false, define, module */
77
;(function(root, factory) {
@@ -404,16 +404,16 @@
404404

405405
// Watchers (order is important because in case of simultaneous change,
406406
// watchers will be called in the same order)
407-
this.scope.$watchCollection(
408-
'rzSliderOptions()',
409-
function(newValue, oldValue) {
410-
if (newValue === oldValue) return
411-
self.applyOptions() // need to be called before synchronizing the values
412-
self.syncLowValue()
413-
if (self.range) self.syncHighValue()
414-
self.resetSlider()
415-
}
416-
)
407+
this.scope.$watchCollection('rzSliderOptions()', function(
408+
newValue,
409+
oldValue
410+
) {
411+
if (newValue === oldValue) return
412+
self.applyOptions() // need to be called before synchronizing the values
413+
self.syncLowValue()
414+
if (self.range) self.syncHighValue()
415+
self.resetSlider()
416+
})
417417

418418
this.scope.$watch('rzSliderModel', function(newValue, oldValue) {
419419
if (self.internalChange) return
@@ -2660,3 +2660,4 @@
26602660

26612661
return module.name
26622662
})
2663+
;

Diff for: dist/rzslider.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: dist/rzslider.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)