Merge branch 'ngforward' of softwarepublico.gov.br:noosfero-themes/angular-theme into ngforward

ABNER SILVA DE OLIVEIRA
2 parents 5dcaf641 d003d3ce
Showing 6 changed files with 23 additions and 26 deletions Show diff stats
src/app/components/noosfero-blocks/block.component.ts
src/app/components/noosfero-blocks/link-list/link-list.component.js
src/app/components/noosfero-blocks/link-list/link-list.component.ts
src/app/components/noosfero-blocks/link-list/link-list.html
src/app/index.ts
src/app/main/main.component.ts
@@ -12,7 +12,7 @@ export class Block {
     ngOnInit() {
         let blockName = this.block.type ? this.block.type.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase() : "default-block";
-        this.$element.replaceWith(this.$compile('<noosfero-' + blockName + ' block="ctrl.block" owner="ctrl.owner"></noosfero-' + blockName + '>')(this.$scope));
+        this.$element.replaceWith(this.$compile('<noosfero-' + blockName + ' [block]="ctrl.block" [owner]="ctrl.owner"></noosfero-' + blockName + '>')(this.$scope));
     }
     constructor(private $element: any, private $scope: ng.IScope, private $injector: ng.auto.IInjectorService, private $compile: ng.ICompileService) {
@@ -1,21 +0,0 @@
-(function() {
-  'use strict';
-
-  angular
-    .module('noosferoApp')
-    .component('noosferoLinkListBlock', {
-      restrict: 'E',
-      templateUrl: 'app/components/noosfero-blocks/link-list/link-list.html',
-      bindings: {
-          block: '<',
-          owner: '<'
-      },
-      controller: LinkListBlockController
-    });
-
-  /** @ngInject */
-  function LinkListBlockController() {
-    this.links = this.block.settings.links;
-  }
-
-})();
@@ -0,0 +1,18 @@
+import {Component, Input} from "ng-forward";
+
+@Component({
+    selector: "noosfero-link-list-block",
+    templateUrl: "app/components/noosfero-blocks/link-list/link-list.html"
+})
+export class LinkListBlock {
+
+    @Input() block: any;
+    @Input() owner: any;
+
+    links: any;
+
+    ngOnInit() {
+        this.links = this.block.settings.links;
+    }
+
+}
 <div class="link-list-block">
-  <div ng-repeat="link in $ctrl.links">
-    <a ng-href="{{link.address | noosferoTemplateFilter:{profile: $ctrl.owner.identifier} }}">
+  <div ng-repeat="link in ctrl.links">
+    <a ng-href="{{link.address | noosferoTemplateFilter:{profile: ctrl.owner.identifier} }}">
       <i class="fa fa-fw icon-{{link.icon}}"></i> <span>{{link.name}}</span>
     </a>
   </div>
@@ -44,7 +44,6 @@ NoosferoApp.addController(&quot;AuthController&quot;, AuthController);
 require("./components/navbar/navbar.directive.js");
 require("./components/noosfero-activities/activities.component.js");
 require("./components/noosfero-activities/activity/activity.component.js");
-require("./components/noosfero-blocks/link-list/link-list.component.js");
 require("./components/noosfero-blocks/main-block/main-block.component.js");
 require("./components/noosfero-blocks/members-block/members-block.component.js");
 require("./components/noosfero-blocks/profile-image/profile-image.component.js");
@@ -6,6 +6,7 @@ import {ArticleView} from &quot;../components/noosfero-articles/article/article_view&quot;
 import {Profile} from "../profile/profile.component";
 import {Boxes} from "../components/noosfero-boxes/boxes.component";
 import {Block} from "../components/noosfero-blocks/block.component";
+import {LinkListBlock} from "../components/noosfero-blocks/link-list/link-list.component";
 import {AuthService} from "./../components/auth/auth_service";
@@ -23,7 +24,7 @@ export class MainContent {
 @Component({
     selector: 'main',
     template: '<div ng-view></div>',
-    directives: [NoosferoArticleBlog, ArticleView, Boxes, Block],
+    directives: [NoosferoArticleBlog, ArticleView, Boxes, Block, LinkListBlock],
     providers: [AuthService, Session]
 })
 @StateConfig([
	@@ -12,7 +12,7 @@ export class Block {		@@ -12,7 +12,7 @@ export class Block {
12		12
13	ngOnInit() {	13	ngOnInit() {
14	let blockName = this.block.type ? this.block.type.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase() : "default-block";	14	let blockName = this.block.type ? this.block.type.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase() : "default-block";
15	- this.$element.replaceWith(this.$compile('<noosfero-' + blockName + ' block="ctrl.block" owner="ctrl.owner"></noosfero-' + blockName + '>')(this.$scope));	15	+ this.$element.replaceWith(this.$compile('<noosfero-' + blockName + ' [block]="ctrl.block" [owner]="ctrl.owner"></noosfero-' + blockName + '>')(this.$scope));
16	}	16	}
17		17
18	constructor(private $element: any, private $scope: ng.IScope, private $injector: ng.auto.IInjectorService, private $compile: ng.ICompileService) {	18	constructor(private $element: any, private $scope: ng.IScope, private $injector: ng.auto.IInjectorService, private $compile: ng.ICompileService) {
	@@ -1,21 +0,0 @@	@@ -1,21 +0,0 @@
1	-(function() {
2	- 'use strict';
3	-
4	- angular
5	- .module('noosferoApp')
6	- .component('noosferoLinkListBlock', {
7	- restrict: 'E',
8	- templateUrl: 'app/components/noosfero-blocks/link-list/link-list.html',
9	- bindings: {
10	- block: '<',
11	- owner: '<'
12	- },
13	- controller: LinkListBlockController
14	- });
15	-
16	- /** @ngInject */
17	- function LinkListBlockController() {
18	- this.links = this.block.settings.links;
19	- }
20	-
21	-})();
@@ -0,0 +1,18 @@		@@ -0,0 +1,18 @@
	1	+import {Component, Input} from "ng-forward";
	2	+
	3	+@Component({
	4	+ selector: "noosfero-link-list-block",
	5	+ templateUrl: "app/components/noosfero-blocks/link-list/link-list.html"
	6	+})
	7	+export class LinkListBlock {
	8	+
	9	+ @Input() block: any;
	10	+ @Input() owner: any;
	11	+
	12	+ links: any;
	13	+
	14	+ ngOnInit() {
	15	+ this.links = this.block.settings.links;
	16	+ }
	17	+
	18	+}
1	<div class="link-list-block">	1	<div class="link-list-block">
2	- <div ng-repeat="link in $ctrl.links">
3	- <a ng-href="{{link.address \| noosferoTemplateFilter:{profile: $ctrl.owner.identifier} }}">	2	+ <div ng-repeat="link in ctrl.links">
		3	+ <a ng-href="{{link.address \| noosferoTemplateFilter:{profile: ctrl.owner.identifier} }}">
4	<i class="fa fa-fw icon-{{link.icon}}"></i> <span>{{link.name}}</span>	4	<i class="fa fa-fw icon-{{link.icon}}"></i> <span>{{link.name}}</span>
5	</a>	5	</a>
6	</div>	6	</div>