diff --git a/src/app/components/noosfero-articles/article/article.directive.ts b/src/app/components/noosfero-articles/article/article.directive.ts index 212d23e..3530a97 100644 --- a/src/app/components/noosfero-articles/article/article.directive.ts +++ b/src/app/components/noosfero-articles/article/article.directive.ts @@ -2,38 +2,22 @@ import { bundle, Input, Inject, Component, Directive } from 'ng-forward'; import {NoosferoArticleBlog} from "../blog/blog.component"; @Component({ - selector: 'noosfero-default-article', - templateUrl: 'app/components/noosfero-articles/article/article.html' -}) -export class ArticleView { - - @Input() article: any; - @Input() profile: any; - - constructor() { - - } -} - -@Component({ selector: 'noosfero-article', - template: '
', - directives: [ArticleView, NoosferoArticleBlog] + templateUrl: 'app/components/noosfero-articles/article/article.html', + directives: [NoosferoArticleBlog] }) @Inject("$element", "$scope", "$injector", "$compile") export class ArticleDirective { @Input() article: any; @Input() profile: any; - directiveName: string; ngOnInit() { let specificDirective = 'noosfero' + this.article.type; - this.directiveName = "noosfero-default-article"; if (this.$injector.has(specificDirective + 'Directive')) { - this.directiveName = specificDirective.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase(); + let directiveName = specificDirective.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase(); + this.$element.replaceWith(this.$compile('<' + directiveName + ' [article]="ctrl.article" [profile]="ctrl.profile">' + directiveName + '>')(this.$scope)); } - this.$element.replaceWith(this.$compile('<' + this.directiveName + ' [article]="ctrl.article" [profile]="ctrl.profile">' + this.directiveName + '>')(this.$scope)); } constructor(private $element: any, private $scope: ng.IScope, private $injector: ng.auto.IInjectorService, private $compile: ng.ICompileService) { diff --git a/src/app/content-viewer/content-viewer.component.ts b/src/app/content-viewer/content-viewer.component.ts index d34ffa4..1739ead 100644 --- a/src/app/content-viewer/content-viewer.component.ts +++ b/src/app/content-viewer/content-viewer.component.ts @@ -1,6 +1,6 @@ import * as noosfero from "../models/interfaces"; -import {ArticleDirective, ArticleView} from "../components/noosfero-articles/article/article.directive"; +import {ArticleDirective} from "../components/noosfero-articles/article/article.directive"; import {Input, Component, StateConfig, Inject} from "ng-forward"; import {NoosferoArticleBlog} from "./../components/noosfero-articles/blog/blog.component"; @@ -8,7 +8,7 @@ import {NoosferoArticleBlog} from "./../components/noosfero-articles/blog/blog.c @Component({ selector: "content-viewer", templateUrl: "app/content-viewer/page.html", - directives: [NoosferoArticleBlog, ArticleView, ArticleDirective] + directives: [NoosferoArticleBlog, ArticleDirective] }) @Inject("noosfero", "$log", "$stateParams") export class ContentViewer { -- libgit2 0.21.2