Skip to content

Commit cc78883

Browse files
committed
Merge branch 'release/5.0.0'
2 parents a1b1eb0 + 0af332d commit cc78883

9 files changed

+1903
-1057
lines changed

.npmignore

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
example/
2+
js/
3+
demos/

Gruntfile.js

+65-38
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,69 @@
11
module.exports = function(grunt) {
2-
grunt.initConfig({
3-
pkg: grunt.file.readJSON('package.json'),
4-
makeDemos: {
5-
demos: {
6-
options: {
7-
mainTemplate: 'index.ejs',
8-
out: 'demos'
9-
}
10-
},
11-
gh_pages: {
12-
options: {
13-
mainTemplate: 'index.ghpages.ejs',
14-
out: './'
15-
}
16-
}
17-
},
18-
uglify: {
19-
src: {
20-
options: {
21-
banner: '/*! <%= pkg.name %> - v<%= pkg.version %>*/\n\n'
22-
},
23-
files: {
24-
'dist/angular-fusioncharts.min.js': ['src/angular-fusioncharts.js']
25-
}
26-
}
2+
grunt.initConfig({
3+
pkg: grunt.file.readJSON('package.json'),
4+
makeDemos: {
5+
demos: {
6+
options: {
7+
mainTemplate: 'index.ejs',
8+
out: 'demos'
9+
}
10+
},
11+
gh_pages: {
12+
options: {
13+
mainTemplate: 'index.ghpages.ejs',
14+
out: './'
15+
}
16+
}
17+
},
18+
uglify: {
19+
src: {
20+
options: {
21+
banner: '/*! <%= pkg.name %> - v<%= pkg.version %>*/\n\n'
2722
},
28-
copy: {
29-
core: {
30-
files: [
31-
{src:'dist/angular-fusioncharts.min.js', dest: 'demos/js/angular-fusioncharts.min.js'},
32-
{src:'src/angular-fusioncharts.js', dest: 'dist/angular-fusioncharts.js'}
33-
]
34-
}
23+
files: {
24+
'dist/angular-fusioncharts.min.js': ['src/angular-fusioncharts.js']
25+
}
26+
}
27+
},
28+
copy: {
29+
core: {
30+
files: [
31+
{
32+
src: 'dist/angular-fusioncharts.min.js',
33+
dest: 'demos/js/angular-fusioncharts.min.js'
34+
},
35+
{
36+
src: 'src/angular-fusioncharts.js',
37+
dest: 'dist/angular-fusioncharts.js'
38+
}
39+
]
40+
}
41+
},
42+
watch: {
43+
options: {
44+
livereload: true
45+
},
46+
taskName: {
47+
files: ['src/*.js', 'example/*.*'],
48+
tasks: ['default']
49+
}
50+
},
51+
connect: {
52+
server: {
53+
options: {
54+
port: 8080,
55+
base: './',
56+
livereload: true
3557
}
36-
});
37-
grunt.loadNpmTasks('grunt-contrib-uglify');
38-
grunt.loadNpmTasks('grunt-contrib-copy');
39-
grunt.loadTasks('./grunt-tasks');
40-
//grunt.registerTask('default', ['makeDemos:demos', 'uglify', 'copy']); // For gh-pages branch only
41-
grunt.registerTask('default', ['uglify', 'copy']); // For other branches
58+
}
59+
}
60+
});
61+
grunt.loadNpmTasks('grunt-contrib-connect');
62+
grunt.loadNpmTasks('grunt-contrib-uglify');
63+
grunt.loadNpmTasks('grunt-contrib-copy');
64+
grunt.loadTasks('./grunt-tasks');
65+
grunt.loadNpmTasks('grunt-contrib-watch');
66+
//grunt.registerTask('default', ['makeDemos:demos', 'uglify', 'copy']); // For gh-pages branch only
67+
grunt.registerTask('default', ['uglify', 'copy']); // For other branches
68+
grunt.registerTask('watch-server', ['connect', 'watch']);
4269
};

0 commit comments

Comments
 (0)