Browse Source

Path fixes, rtl fixes

pull/1785/head
jlukic 10 years ago
parent
commit
1e0a71d9e4
5 changed files with 34 additions and 29 deletions
  1. 10
      tasks/build.js
  2. 24
      tasks/collections/internal.js
  3. 16
      tasks/config/docs.js
  4. 6
      tasks/rtl/build.js
  5. 7
      tasks/watch.js

10
tasks/build.js

@ -59,14 +59,14 @@ module.exports = function(callback) {
return;
}
// check for RTL
if(config.rtl) {
// check for right-to-left language
if(config.rtl === true || config.rtl === 'Yes') {
gulp.start('build rtl');
return;
}
// unified css stream
stream = gulp.src(source.definitions + '**/' + globs.components + '.less')
stream = gulp.src(source.definitions + '/**/' + globs.components + '.less')
.pipe(plumber())
.pipe(less(settings.less))
.pipe(autoprefixer(settings.prefix))
@ -110,13 +110,13 @@ module.exports = function(callback) {
;
// copy assets
gulp.src(source.themes + '**/assets/**/' + globs.components + '?(s).*')
gulp.src(source.themes + '/**/assets/**/' + globs.components + '?(s).*')
.pipe(gulpif(config.hasPermission, chmod(config.permission)))
.pipe(gulp.dest(output.themes))
;
// copy source javascript
gulp.src(source.definitions + '**/' + globs.components + '.js')
gulp.src(source.definitions + '/**/' + globs.components + '.js')
.pipe(plumber())
.pipe(flatten())
.pipe(gulp.dest(output.uncompressed))

24
tasks/collections/internal.js

@ -50,7 +50,7 @@ module.exports = function(gulp) {
---------------*/
gulp.task('package uncompressed css', function() {
return gulp.src(output.uncompressed + '**/' + globs.components + globs.ignored + '.css')
return gulp.src(output.uncompressed + '/**/' + globs.components + globs.ignored + '.css')
.pipe(plumber())
.pipe(replace(assets.uncompressed, assets.packaged))
.pipe(concatCSS(filenames.concatenatedCSS))
@ -61,7 +61,7 @@ module.exports = function(gulp) {
});
gulp.task('package compressed css', function() {
return gulp.src(output.uncompressed + '**/' + globs.components + globs.ignored + '.css')
return gulp.src(output.uncompressed + '/**/' + globs.components + globs.ignored + '.css')
.pipe(plumber())
.pipe(replace(assets.uncompressed, assets.packaged))
.pipe(concatCSS(filenames.concatenatedMinifiedCSS))
@ -74,7 +74,7 @@ module.exports = function(gulp) {
});
gulp.task('package uncompressed js', function() {
return gulp.src(output.uncompressed + '**/' + globs.components + globs.ignored + '.js')
return gulp.src(output.uncompressed + '/**/' + globs.components + globs.ignored + '.js')
.pipe(plumber())
.pipe(replace(assets.uncompressed, assets.packaged))
.pipe(concat(filenames.concatenatedJS))
@ -86,7 +86,7 @@ module.exports = function(gulp) {
});
gulp.task('package compressed js', function() {
return gulp.src(output.uncompressed + '**/' + globs.components + globs.ignored + '.js')
return gulp.src(output.uncompressed + '/**/' + globs.components + globs.ignored + '.js')
.pipe(plumber())
.pipe(replace(assets.uncompressed, assets.packaged))
.pipe(concat(filenames.concatenatedMinifiedJS))
@ -103,7 +103,7 @@ module.exports = function(gulp) {
---------------*/
gulp.task('package uncompressed rtl css', function () {
return gulp.src(output.uncompressed + '**/' + globs.components + globs.ignoredRTL + '.rtl.css')
return gulp.src(output.uncompressed + '/**/' + globs.components + globs.ignoredRTL + '.rtl.css')
.pipe(replace(assets.uncompressed, assets.packaged))
.pipe(concatCSS(filenames.concatenatedRTLCSS))
.pipe(gulp.dest(output.packaged))
@ -112,7 +112,7 @@ module.exports = function(gulp) {
});
gulp.task('package compressed rtl css', function () {
return gulp.src(output.uncompressed + '**/' + globs.components + globs.ignoredRTL + '.rtl.css')
return gulp.src(output.uncompressed + '/**/' + globs.components + globs.ignoredRTL + '.rtl.css')
.pipe(replace(assets.uncompressed, assets.packaged))
.pipe(concatCSS(filenames.concatenatedMinifiedRTLCSS))
.pipe(minifyCSS(settings.minify))
@ -123,7 +123,7 @@ module.exports = function(gulp) {
});
gulp.task('package uncompressed docs css', function() {
return gulp.src(output.uncompressed + '**/' + globs.components + globs.ignored + '.css')
return gulp.src(output.uncompressed + '/**/' + globs.components + globs.ignored + '.css')
.pipe(plumber())
.pipe(replace(assets.uncompressed, assets.packaged))
.pipe(concatCSS(filenames.concatenatedCSS))
@ -134,7 +134,7 @@ module.exports = function(gulp) {
});
gulp.task('package compressed docs css', function() {
return gulp.src(output.uncompressed + '**/' + globs.components + globs.ignored + '.css')
return gulp.src(output.uncompressed + '/**/' + globs.components + globs.ignored + '.css')
.pipe(plumber())
.pipe(replace(assets.uncompressed, assets.packaged))
.pipe(concatCSS(filenames.concatenatedMinifiedCSS))
@ -155,7 +155,7 @@ module.exports = function(gulp) {
;
gulp.task('package uncompressed docs css', function() {
return gulp.src(docsOutput.uncompressed + '**/' + globs.components + globs.ignored + '.css')
return gulp.src(docsOutput.uncompressed + '/**/' + globs.components + globs.ignored + '.css')
.pipe(plumber())
.pipe(replace(assets.uncompressed, assets.packaged))
.pipe(concatCSS(filenames.concatenatedCSS))
@ -166,7 +166,7 @@ module.exports = function(gulp) {
});
gulp.task('package compressed docs css', function() {
return gulp.src(docsOutput.uncompressed + '**/' + globs.components + globs.ignored + '.css')
return gulp.src(docsOutput.uncompressed + '/**/' + globs.components + globs.ignored + '.css')
.pipe(plumber())
.pipe(replace(assets.uncompressed, assets.packaged))
.pipe(concatCSS(filenames.concatenatedMinifiedCSS))
@ -179,7 +179,7 @@ module.exports = function(gulp) {
});
gulp.task('package uncompressed docs js', function() {
return gulp.src(docsOutput.uncompressed + '**/' + globs.components + globs.ignored + '.js')
return gulp.src(docsOutput.uncompressed + '/**/' + globs.components + globs.ignored + '.js')
.pipe(plumber())
.pipe(replace(assets.uncompressed, assets.packaged))
.pipe(concat(filenames.concatenatedJS))
@ -191,7 +191,7 @@ module.exports = function(gulp) {
});
gulp.task('package compressed docs js', function() {
return gulp.src(docsOutput.uncompressed + '**/' + globs.components + globs.ignored + '.js')
return gulp.src(docsOutput.uncompressed + '/**/' + globs.components + globs.ignored + '.js')
.pipe(plumber())
.pipe(replace(assets.uncompressed, assets.packaged))
.pipe(concat(filenames.concatenatedMinifiedJS))

16
tasks/config/docs.js

@ -8,16 +8,16 @@ module.exports = {
paths: {
source: {
config : 'src/theme.config',
definitions : 'src/definitions/',
site : 'src/site/',
themes : 'src/themes/'
definitions : 'src/definitions',
site : 'src/site',
themes : 'src/themes'
},
output: {
less : '../docs/out/src/',
packaged : '../docs/out/dist/',
uncompressed : '../docs/out/dist/components/',
compressed : '../docs/out/dist/components/',
themes : '../docs/out/dist/themes/'
less : '../docs/out/src',
packaged : '../docs/out/dist',
uncompressed : '../docs/out/dist/components',
compressed : '../docs/out/dist/components',
themes : '../docs/out/dist/themes'
},
clean: '../docs/out/dist/'
}

6
tasks/rtl/build.js

@ -62,7 +62,7 @@ module.exports = function(callback) {
}
// unified css stream
stream = gulp.src(source.definitions + '**/' + globs.components + '.less')
stream = gulp.src(source.definitions + '/**/' + globs.components + '.less')
.pipe(plumber())
.pipe(less(settings.less))
.pipe(autoprefixer(settings.prefix))
@ -108,13 +108,13 @@ module.exports = function(callback) {
;
// copy assets
gulp.src(source.themes + '**/assets/**/' + globs.components + '?(s).*')
gulp.src(source.themes + '/**/assets/**/' + globs.components + '?(s).*')
.pipe(gulpif(config.hasPermission, chmod(config.permission)))
.pipe(gulp.dest(output.themes))
;
// copy source javascript
gulp.src(source.definitions + '**/' + globs.components + '.js')
gulp.src(source.definitions + '/**/' + globs.components + '.js')
.pipe(plumber())
.pipe(flatten())
.pipe(gulp.dest(output.uncompressed))

7
tasks/watch.js

@ -57,8 +57,13 @@ module.exports = function(callback) {
return;
}
// check for right-to-left language
if(config.rtl === true || config.rtl === 'Yes') {
gulp.start('watch rtl');
return;
}
//console.clear();
console.log(source.definitions);
console.log('Watching source files for changes');
/*--------------

Loading…
Cancel
Save