diff --git a/bower.json b/bower.json index 68ec818..d620d14 100644 --- a/bower.json +++ b/bower.json @@ -36,14 +36,21 @@ "angular-load": "^0.4.1", "angular-translate-interpolation-messageformat": "^2.10.0", "angular-bind-html-compile": "^1.2.1", - "angular-click-outside": "^2.7.1" + "angular-click-outside": "^2.7.1", + "ng-ckeditor": "^0.2.1" }, "devDependencies": { - "angular-mocks": "~1.5.0", - "ng-ckeditor": "^0.2.1", - "ckeditor": "^4.5.8" + "angular-mocks": "~1.5.0" }, "overrides": { + "ng-ckeditor": { + "main": [ + "ng-ckeditor.js", + "libs/ckeditor/lang", + "libs/ckeditor/ckeditor.js", + "libs/ckeditor/config.js" + ] + }, "bootstrap-sass": { "main": [ "assets/stylesheets/_bootstrap.scss", diff --git a/gulp/build.js b/gulp/build.js index 5fbcf39..951f420 100644 --- a/gulp/build.js +++ b/gulp/build.js @@ -103,6 +103,7 @@ gulp.task('fonts', function () { }); gulp.task('ckeditor', function () { + conf.wiredep.exclude.push(/ckeditor/); // exclude ckeditor from build to improve performance return gulp.src(['bower_components/ng-ckeditor/**/*']).pipe(gulp.dest(path.join(conf.paths.dist, '/ng-ckeditor'))); }); @@ -153,4 +154,4 @@ gulp.task('noosfero', ['html'], function () { return merge(layouts, theme, index); }); -gulp.task('build', ['html', 'fonts', 'other', 'locale', 'ckeditor', 'plugin-languages', 'noosfero']); +gulp.task('build', ['ckeditor', 'html', 'fonts', 'other', 'locale', 'plugin-languages', 'noosfero']); diff --git a/gulp/conf.js b/gulp/conf.js index bbb767d..191d96a 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/, /ckeditor/], + exclude: [/jquery/, /\/bootstrap\.js$/, /\/bootstrap-sass\/.*\.js/, /\/bootstrap\.css/], directory: 'bower_components' }; -- libgit2 0.21.2