Merge branch 'master' into v1-dev

modularcoder · modularcoder · commit 45deedd30dc1 · 2017-08-19T03:19:17.000+04:00
diff --git a/build/tasks/app-assets.js b/build/tasks/app-assets.js
@@ -2,5 +2,6 @@ var config = require('../config');
 
 module.exports.task = function(gulp, plugins, paths) {
 	gulp.src(paths.app.assets)
-		.pipe(gulp.dest(config.destDir + "/assets"));
+		.pipe(gulp.dest(config.destDir + "/assets"))
+		.pipe(plugins.connect.reload()); 
 };
diff --git a/build/tasks/app-pages.js b/build/tasks/app-pages.js
@@ -63,7 +63,10 @@ module.exports.task = function(gulp, plugins, paths) {
 		}))
 
 		// Output
-		.pipe(gulp.dest(config.destDir));
+		.pipe(gulp.dest(config.destDir))
+
+		//Live-Reload
+		.pipe(plugins.connect.reload()); 
 	
 };
 
diff --git a/build/tasks/app-scripts.js b/build/tasks/app-scripts.js
@@ -3,5 +3,6 @@ var config = require('../config');
 module.exports.task = function(gulp, plugins, paths) {
 	gulp.src(paths.app.scripts)
 		.pipe(plugins.concat('app.js'))
-		.pipe(gulp.dest(config.destDir + '/js'));
+		.pipe(gulp.dest(config.destDir + '/js'))
+		.pipe(plugins.connect.reload()); 
 };
diff --git a/build/tasks/app-styles.js b/build/tasks/app-styles.js
@@ -16,5 +16,6 @@ module.exports.task = function(gulp, plugins, paths) {
 			.on('error', plugins.sass.logError)
 		)
 		.pipe(plugins.autoprefixer())
-		.pipe(gulp.dest(config.destDir + '/css'));
+		.pipe(gulp.dest(config.destDir + '/css'))
+		.pipe(plugins.connect.reload()).on( 'error', plugins.sass.logError );
 };
diff --git a/build/tasks/app-themes.js b/build/tasks/app-themes.js
@@ -27,7 +27,8 @@ module.exports.task = function(gulp, plugins, paths) {
 				.on('error', plugins.sass.logError)
 			)
 			.pipe(plugins.autoprefixer())
-			.pipe(gulp.dest(config.destDir + '/css'));
+			.pipe(gulp.dest(config.destDir + '/css'))
+			.pipe(plugins.connect.reload());
 
 	});
 
diff --git a/build/tasks/vendor-assets.js b/build/tasks/vendor-assets.js
@@ -2,8 +2,10 @@ var config = require('../config');
 
 module.exports.task = function(gulp, plugins, paths) {
 	gulp.src(paths.vendor.assets)
-		.pipe(gulp.dest(config.destDir + "/assets"));
+		.pipe(gulp.dest(config.destDir + "/assets")) 
+		.pipe(plugins.connect.reload());
 
 	gulp.src(paths.vendor.fonts)
-		.pipe(gulp.dest(config.destDir + "/fonts"));
+		.pipe(gulp.dest(config.destDir + "/fonts"))
+		.pipe(plugins.connect.reload());
 };
diff --git a/build/tasks/vendor-scripts.js b/build/tasks/vendor-scripts.js
@@ -3,5 +3,6 @@ var config = require('../config');
 module.exports.task = function(gulp, plugins, paths) {
 	gulp.src(paths.vendor.scripts)
 		.pipe(plugins.concat('vendor.js'))
-		.pipe(gulp.dest(config.destDir + "/js"));
+		.pipe(gulp.dest(config.destDir + "/js"))
+		.pipe(plugins.connect.reload());
 };
diff --git a/build/tasks/vendor-styles.js b/build/tasks/vendor-styles.js
@@ -4,5 +4,6 @@ var path = require('path');
 module.exports.task = function(gulp, plugins, paths) {
 	gulp.src(paths.vendor.styles)
 		.pipe(plugins.concat('vendor.css'))
-		.pipe(gulp.dest(config.destDir + "/css"));
+		.pipe(gulp.dest(config.destDir + "/css"))
+		.pipe(plugins.connect.reload()).on( 'error', plugins.sass.logError );
 };

Original file line number	Diff line number	Diff line change
`@@ -16,5 +16,6 @@ module.exports.task = function(gulp, plugins, paths) {`
`16`	`16`	`.on('error', plugins.sass.logError)`
`17`	`17`	`)`
`18`	`18`	`.pipe(plugins.autoprefixer())`
`19`		`- .pipe(gulp.dest(config.destDir + '/css'));`
	`19`	`+ .pipe(gulp.dest(config.destDir + '/css'))`
	`20`	`+ .pipe(plugins.connect.reload()).on( 'error', plugins.sass.logError );`
`20`	`21`	`};`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,8 @@ module.exports.task = function(gulp, plugins, paths) {`
`27`	`27`	`.on('error', plugins.sass.logError)`
`28`	`28`	`)`
`29`	`29`	`.pipe(plugins.autoprefixer())`
`30`		`- .pipe(gulp.dest(config.destDir + '/css'));`
	`30`	`+ .pipe(gulp.dest(config.destDir + '/css'))`
	`31`	`+ .pipe(plugins.connect.reload());`
`31`	`32`
`32`	`33`	`});`
`33`	`34`