From 5727b1d88a0b29350b58192cc5be238db71a6900 Mon Sep 17 00:00:00 2001 From: Victor Costa Date: Wed, 11 May 2016 11:17:06 -0300 Subject: [PATCH] Fix build of ckeditor --- gulp/build.js | 8 +++++++- gulp/conf.js | 2 +- src/index.html | 6 ++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/gulp/build.js b/gulp/build.js index 1e9a872..d35d662 100644 --- a/gulp/build.js +++ b/gulp/build.js @@ -80,6 +80,8 @@ gulp.task('html', ['inject', 'partials'], function () { .pipe($.useref()) .pipe($.revReplace({prefix: noosferoThemePrefix})) .pipe(htmlFilter) + .pipe($.replace('/ng-ckeditor/libs/ckeditor/', noosferoThemePrefix + 'ng-ckeditor/libs/ckeditor/')) + .pipe($.replace('/ng-ckeditor/ng-ckeditor.min.js', noosferoThemePrefix + 'ng-ckeditor/ng-ckeditor.min.js')) .pipe($.minifyHtml({ empty: true, spare: true, @@ -100,6 +102,10 @@ gulp.task('fonts', function () { .pipe(gulp.dest(path.join(conf.paths.dist, '/fonts/'))); }); +gulp.task('ckeditor', function () { + return gulp.src(['bower_components/ng-ckeditor/**/*']).pipe(gulp.dest(path.join(conf.paths.dist, '/ng-ckeditor'))); +}); + gulp.task('locale', function () { return gulp.src([ path.join("bower_components/angular-i18n", '*.js'), @@ -147,4 +153,4 @@ gulp.task('noosfero', ['html'], function () { return merge(layouts, theme, index); }); -gulp.task('build', ['html', 'fonts', 'other', 'locale', 'plugin-languages', 'noosfero']); +gulp.task('build', ['html', 'fonts', 'other', 'locale', 'ckeditor', 'plugin-languages', 'noosfero']); diff --git a/gulp/conf.js b/gulp/conf.js index 191d96a..bbb767d 100644 --- a/gulp/conf.js +++ b/gulp/conf.js @@ -36,7 +36,7 @@ exports.configTheme(argv.theme); * to inject css preprocessor deps and js files in karma */ exports.wiredep = { - exclude: [/jquery/, /\/bootstrap\.js$/, /\/bootstrap-sass\/.*\.js/, /\/bootstrap\.css/], + exclude: [/jquery/, /\/bootstrap\.js$/, /\/bootstrap-sass\/.*\.js/, /\/bootstrap\.css/, /ckeditor/], directory: 'bower_components' }; diff --git a/src/index.html b/src/index.html index 954dffd..ed74e0e 100644 --- a/src/index.html +++ b/src/index.html @@ -27,6 +27,10 @@
+ + @@ -42,5 +46,7 @@ + + -- libgit2 0.21.2