Made changes to conform to code review comments.

This commit is contained in:
Sean Newell 2017-03-10 08:56:57 -06:00
parent 7c822661e6
commit 86d569e636

View File

@ -186,14 +186,16 @@ gulp.task('chat-styles', ['chat-styles-handlebars', 'chat-styles-js'], function(
// Compile and concatenate handlebars files for all chat styles. // Compile and concatenate handlebars files for all chat styles.
gulp.task('chat-styles-handlebars', function() { gulp.task('chat-styles-handlebars', function() {
var promises = []; fs.readdir(config.chatStylesPath, function(err, list) {
fs.readdir(config.chatStylesPath, function(err, list){ if(err) {
if(err) return done(err); throw err;
list.filter(function(path){ }
list.filter(function(path) {
return fs.lstatSync(config.chatStylesPath + "/" + path).isDirectory(); return fs.lstatSync(config.chatStylesPath + "/" + path).isDirectory();
}).map(function(dir){ }).map(function(dir) {
promises.push(new Promise(function(resolve, reject){ return new Promise(function(resolve, reject) {
var pipeline = gulp.src(config.chatStylesPath + '/' + dir + '/templates_src/client_side/**/*.handlebars') gulp.src(config.chatStylesPath + '/' + dir + '/templates_src/client_side/**/*.handlebars')
.pipe(handlebars({ .pipe(handlebars({
// Use specific version of Handlebars.js // Use specific version of Handlebars.js
handlebars: handlebarsEngine handlebars: handlebarsEngine
@ -202,44 +204,48 @@ gulp.task('chat-styles-handlebars', function() {
.pipe(concat('templates.js')) .pipe(concat('templates.js'))
.pipe(uglify({preserveComments: 'some'})) .pipe(uglify({preserveComments: 'some'}))
.pipe(header(config.compiledTemplatesHeader)) .pipe(header(config.compiledTemplatesHeader))
.pipe(gulp.dest(config.chatStylesPath + '/' + dir + '/templates_compiled/client_side')); .pipe(gulp.dest(config.chatStylesPath + '/' + dir + '/templates_compiled/client_side'))
pipeline.on('end', resolve); .on('end', resolve)
pipeline.on('error', reject); .on('error', reject);
})); });
}); });
}); });
}); });
// Compile and concatenate js files for all chat styles. // Compile and concatenate js files for all chat styles.
gulp.task('chat-styles-js', function() { gulp.task('chat-styles-js', function() {
var promises = []; fs.readdir(config.chatStylesPath, function(err, list) {
fs.readdir(config.chatStylesPath, function(err, list){ if(err) {
if(err) return done(err); throw err;
list.filter(function(path){ }
list.filter(function(path) {
return fs.lstatSync(config.chatStylesPath + "/" + path).isDirectory(); return fs.lstatSync(config.chatStylesPath + "/" + path).isDirectory();
}).map(function(dir){ }).map(function(dir) {
promises.push(new Promise(function(resolve, reject){ return new Promise(function(resolve, reject) {
var pipeline = gulp.src(config.chatStylesPath + '/' + dir + '/js/source/**/*.js') gulp.src(config.chatStylesPath + '/' + dir + '/js/source/**/*.js')
.pipe(concat('scripts.js')) .pipe(concat('scripts.js'))
.pipe(uglify({preserveComments: 'some'})) .pipe(uglify({preserveComments: 'some'}))
.pipe(gulp.dest(config.chatStylesPath + '/' + dir + '/js/compiled')); .pipe(gulp.dest(config.chatStylesPath + '/' + dir + '/js/compiled'))
pipeline.on('end', resolve); .on('end', resolve)
pipeline.on('error', reject); .on('error', reject);
})); });
}); });
}); });
}); });
// Performs all job related with pages styles. // Performs all job related with pages styles.
gulp.task('page-styles', function() { gulp.task('page-styles', function() {
var promises = []; fs.readdir(config.pageStylesPath, function(err, list) {
fs.readdir(config.pageStylesPath, function(err, list){ if(err) {
if(err) return done(err); throw err;
list.filter(function(path){ }
list.filter(function(path) {
return fs.lstatSync(config.pageStylesPath + "/" + path).isDirectory(); return fs.lstatSync(config.pageStylesPath + "/" + path).isDirectory();
}).map(function(dir){ }).map(function(dir) {
promises.push(new Promise(function(resolve, reject){ return new Promise(function(resolve, reject) {
var pipeline = gulp.src(config.pageStylesPath + '/' + dir + '/templates_src/client_side/**/*.handlebars') gulp.src(config.pageStylesPath + '/' + dir + '/templates_src/client_side/**/*.handlebars')
.pipe(handlebars({ .pipe(handlebars({
// Use specific version of Handlebars.js // Use specific version of Handlebars.js
handlebars: handlebarsEngine handlebars: handlebarsEngine
@ -248,16 +254,16 @@ gulp.task('page-styles', function() {
.pipe(concat('templates.js')) .pipe(concat('templates.js'))
.pipe(uglify({preserveComments: 'some'})) .pipe(uglify({preserveComments: 'some'}))
.pipe(header(config.compiledTemplatesHeader)) .pipe(header(config.compiledTemplatesHeader))
.pipe(gulp.dest(config.pageStylesPath + '/' + dir + '/templates_compiled/client_side')); .pipe(gulp.dest(config.pageStylesPath + '/' + dir + '/templates_compiled/client_side'))
pipeline.on('end', resolve); .on('end', resolve)
pipeline.on('error', reject); .on('error', reject);
})); });
}); });
}); });
}); });
// Watch styles // Watch styles
gulp.task('watch', [], function(){ gulp.task('watch', [], function() {
gulp.watch(config.pageStylesPath + '/**/*.handlebars', ['page-styles']); gulp.watch(config.pageStylesPath + '/**/*.handlebars', ['page-styles']);
gulp.watch(config.chatStylesPath + '/**/js/source/**/*.js', ['chat-styles-js']); gulp.watch(config.chatStylesPath + '/**/js/source/**/*.js', ['chat-styles-js']);
gulp.watch(config.chatStylesPath + '/**/*.handlebars', ['chat-styles-handlebars']); gulp.watch(config.chatStylesPath + '/**/*.handlebars', ['chat-styles-handlebars']);