Merge commit 'dd04c360082eb7e0c54425907224ecf692307906' into update_visjs_again

This commit is contained in:
Eldon Koyle
2016-02-17 11:57:17 -07:00
134 changed files with 19644 additions and 12155 deletions
+6 -6
View File
@@ -100,6 +100,7 @@ gulp.task('bundle-css', ['clean'], function () {
var files = [
'./lib/shared/activator.css',
'./lib/shared/bootstrap.css',
'./lib/shared/configuration.css',
'./lib/timeline/component/css/timeline.css',
'./lib/timeline/component/css/panel.css',
@@ -115,9 +116,8 @@ gulp.task('bundle-css', ['clean'], function () {
'./lib/timeline/component/css/pathStyles.css',
'./lib/network/css/network-manipulation.css',
'./lib/network/css/network-navigation.css',
'./lib/network/css/network-tooltip.css',
'./lib/network/css/network-configuration.css',
'./lib/network/css/network-navigation.css',
'./lib/network/css/network-colorpicker.css'
];
@@ -132,13 +132,13 @@ gulp.task('bundle-css', ['clean'], function () {
});
gulp.task('copy', ['clean'], function () {
var network = gulp.src('./lib/network/img/**/*')
var network = gulp.src('./lib/network/img/**/*')
.pipe(gulp.dest(DIST + '/img/network'));
var timeline = gulp.src('./lib/timeline/img/**/*')
var timeline = gulp.src('./lib/timeline/img/**/*')
.pipe(gulp.dest(DIST + '/img/timeline'));
return merge(network, timeline);
return merge(network, timeline);
});
gulp.task('minify', ['bundle-js'], function (cb) {
@@ -148,7 +148,7 @@ gulp.task('minify', ['bundle-js'], function (cb) {
// any issues when concatenating the file downstream (the file ends
// with a comment).
fs.writeFileSync(DIST + '/' + VIS_MIN_JS, result.code + '\n');
fs.writeFileSync(DIST + '/' + VIS_MAP, result.map);
fs.writeFileSync(DIST + '/' + VIS_MAP, result.map.replace(/"\.\/dist\//g, '"'));
cb();
});