From 174eca7db87108c1fca2c6ceff8d423efb9ffa14 Mon Sep 17 00:00:00 2001
From: PavelBegunkov <asml.Silence@gmail.com>
Date: Fri, 3 Jul 2015 12:26:20 +0300
Subject: [PATCH] Add gulp watcher for js. Fix Select2 in
Create(Edit)Discipline.
---
deploy/gulpfile.js | 25 +++++++++++++------------
media/{less => css}/select2.css | 0
2 files changed, 13 insertions(+), 12 deletions(-)
rename media/{less => css}/select2.css (100%)
diff --git a/deploy/gulpfile.js b/deploy/gulpfile.js
index 8e8a15a01..e5de90a5e 100644
--- a/deploy/gulpfile.js
+++ b/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']);
});
diff --git a/media/less/select2.css b/media/css/select2.css
similarity index 100%
rename from media/less/select2.css
rename to media/css/select2.css
--
GitLab