Download as
Browse Code »

Commit 479a013a2d966a4d09683c4b7f2bb37cb6723133

Authored by Carlos Purificação
2 parents 49c1ee26 7921e436
Exists in master and in 26 other branches activities_block, btn-new-post, cosmetic_changes_people_and_communities_block, edit-blocks, edit-header-footer, env-tags-block, forgot_password, layout_support, list_articles_on_blog, loading-indicator-component, login_modal, login_modal_improve, person_info_block, profile-article-resolvers, profile-blocks-sass, profile_description_block_component, profile_page_improvements, recent-activities, remove-article-confirmation, skin-small-change, staging, tags-block, theme-skin-yellow, translations, updated_signup_page, users_profile_page

Merge remote-tracking branch 'origin/master' into login-block

Showing 4 changed files with 15 additions and 6 deletions   Show diff stats
bower.json
  Diff comments   View file @479a013
... ... @@ -36,14 +36,21 @@
36 36 "angular-load": "^0.4.1",
37 37 "angular-translate-interpolation-messageformat": "^2.10.0",
38 38 "angular-bind-html-compile": "^1.2.1",
39   - "angular-click-outside": "^2.7.1"
  39 + "angular-click-outside": "^2.7.1",
  40 + "ng-ckeditor": "^0.2.1"
40 41 },
41 42 "devDependencies": {
42   - "angular-mocks": "~1.5.0",
43   - "ng-ckeditor": "^0.2.1",
44   - "ckeditor": "^4.5.8"
  43 + "angular-mocks": "~1.5.0"
45 44 },
46 45 "overrides": {
  46 + "ng-ckeditor": {
  47 + "main": [
  48 + "ng-ckeditor.js",
  49 + "libs/ckeditor/lang",
  50 + "libs/ckeditor/ckeditor.js",
  51 + "libs/ckeditor/config.js"
  52 + ]
  53 + },
47 54 "bootstrap-sass": {
48 55 "main": [
49 56 "assets/stylesheets/_bootstrap.scss",
... ...
gulp/build.js
  Diff comments   View file @479a013
... ... @@ -103,6 +103,7 @@ gulp.task('fonts', function () {
103 103 });
104 104  
105 105 gulp.task('ckeditor', function () {
  106 + conf.wiredep.exclude.push(/ckeditor/); // exclude ckeditor from build to improve performance
106 107 return gulp.src(['bower_components/ng-ckeditor/**/*']).pipe(gulp.dest(path.join(conf.paths.dist, '/ng-ckeditor')));
107 108 });
108 109  
... ... @@ -153,4 +154,4 @@ gulp.task('noosfero', ['html'], function () {
153 154 return merge(layouts, theme, index);
154 155 });
155 156  
156   -gulp.task('build', ['html', 'fonts', 'other', 'locale', 'ckeditor', 'plugin-languages', 'noosfero']);
  157 +gulp.task('build', ['ckeditor', 'html', 'fonts', 'other', 'locale', 'plugin-languages', 'noosfero']);
... ...
gulp/conf.js
  Diff comments   View file @479a013
... ... @@ -36,7 +36,7 @@ exports.configTheme(argv.theme);
36 36 * to inject css preprocessor deps and js files in karma
37 37 */
38 38 exports.wiredep = {
39   - exclude: [/jquery/, /\/bootstrap\.js$/, /\/bootstrap-sass\/.*\.js/, /\/bootstrap\.css/, /ckeditor/],
  39 + exclude: [/jquery/, /\/bootstrap\.js$/, /\/bootstrap-sass\/.*\.js/, /\/bootstrap\.css/],
40 40 directory: 'bower_components'
41 41 };
42 42  
... ...
src/app/article/cms/cms.component.spec.ts
  Diff comments   View file @479a013
... ... @@ -55,6 +55,7 @@ describe("Article Cms", () => {
55 55 });
56 56  
57 57 it("got to the new article page and display an alert when saving sucessfully", done => {
  58 + $stateParams['parent_id'] = 1;
58 59 let component: CmsComponent = new CmsComponent(articleServiceMock, profileServiceMock, $state, notification, $stateParams, $window);
59 60 component.save();
60 61 $rootScope.$apply();
... ...