Merge remote-tracking branch 'upsteam/master' into issue-29

deploy/gulpfile.js

@@ -22,9 +22,9 @@ var sysPath = {
 };
 
 var srcPath = {
-    css: sysPath.root + 'media/css/',
-    less: sysPath.root + 'media/less/',
-    js: sysPath.root + 'media/js/',
+    css: sysPath.root + 'media/css/**/*.css',
+    less: sysPath.root + 'media/less/**/*.less',
+    js: sysPath.root + 'media/js/**/*.js',
     media: sysPath.root + 'media/',
     config: sysPath.root + 'config/',
 };
@@ -44,23 +44,23 @@ var dstPath = {
 // =============================
 
 gulp.task('less:compile', function () {
-	gulp.src(srcPath.less + '**/*.less')
-    	.pipe(less())
-    	.pipe(gulp.dest(dstPath.css));
+	gulp.src( srcPath.less )
+    	.pipe( less() )
+    	.pipe( gulp.dest( dstPath.css ) );
 });
 
 gulp.task('css:copy', function() {
-    gulp.src(srcPath.css + '**/*.css')
-        .pipe(gulp.dest(dstPath.css));
+    gulp.src( srcPath.css )
+        .pipe( gulp.dest( dstPath.css ) );
 });
 
 gulp.task('js:copy', function() {
-    gulp.src(srcPath.js + '**/*.js')
+    gulp.src( srcPath.js )
         .pipe(gulp.dest(dstPath.js));
 });
 
 gulp.task('config:copy', function() {
-    gulp.src(srcPath.config + '*')
+    gulp.src( srcPath.config )
         .pipe(gulp.dest(dstPath.config));
 });
 
@@ -96,8 +96,9 @@ gulp.task('folders:create', function() {
 // =============================
 
 gulp.task('watch', function () {
-	gulp.watch(srcPath.css + '*.css', ['css:copy']);
-	gulp.watch(srcPath.less + '*.less', ['less:compile']);
+	gulp.watch( srcPath.css, ['css:copy']);
+	gulp.watch( srcPath.less, ['less:compile']);
+    gulp.watch( srcPath.js, ['js:copy']);
 });