Migrating main controller

Victor Costa
1 parent d3a3844a
Showing 4 changed files with 13 additions and 12 deletions Show diff stats
src/app/index.module.ts
src/app/index.ts
src/app/main/main.controller.ts
src/app/main/main.html
+import {Main} from "./main/main.controller";
+
 export class NoosferoApp {
  
-    static appName: string = "noosferoApp";
+    static appName: string = (<any>Main).name;
  
     static init() {
         angular.module(NoosferoApp.appName, ["ngAnimate", "ngCookies", "ngStorage", "ngTouch",
@@ -51,4 +51,4 @@ declare var moment: any;
  
 // NoosferoApp.addConfig(routeConfig);
  
-bootstrap(Main, ['ui.router']);
+console.log(bootstrap(Main, ['ui.router']));
 import {Component, StateConfig} from 'ng-forward';
  
 @Component({
+    selector: 'main2',
+    template: `test main2`
+})
+export class Main2 {
+
+}
+
+@Component({
     selector: 'main',
     template: `aaaa <div ui-view></div>`
 })
@@ -9,7 +17,7 @@ import {Component, StateConfig} from &#39;ng-forward&#39;;
         url: '/',
         component: Main2,
         // templateUrl: "app/main/main.html",
-        name: 'main2',
+        name: 'main',
         // resolve: {
         // currentUser: function(AuthService) {
         // return AuthService.loginFromCookie();
@@ -20,11 +28,3 @@ import {Component, StateConfig} from &#39;ng-forward&#39;;
 export class Main {
  
 }
-
-@Component({
-    selector: 'Main2',
-    template: `test main2`
-})
-export class Main2 {
-
-}
 <acme-navbar></acme-navbar>
 <div ui-view="content"></div>
-asdas dasd asdas d
	1	+import {Main} from "./main/main.controller";
	2	+
1	3	export class NoosferoApp {
2	4
3		- static appName: string = "noosferoApp";
	5	+ static appName: string = (<any>Main).name;
4	6
5	7	static init() {
6	8	angular.module(NoosferoApp.appName, ["ngAnimate", "ngCookies", "ngStorage", "ngTouch",
...	...
...	...	@@ -51,4 +51,4 @@ declare var moment: any;
51	51
52	52	// NoosferoApp.addConfig(routeConfig);
53	53
54		-bootstrap(Main, ['ui.router']);
	54	+console.log(bootstrap(Main, ['ui.router']));
...	...
1	1	import {Component, StateConfig} from 'ng-forward';
2	2
3	3	@Component({
	4	+ selector: 'main2',
	5	+ template: `test main2`
	6	+})
	7	+export class Main2 {
	8	+
	9	+}
	10	+
	11	+@Component({
4	12	selector: 'main',
5	13	template: `aaaa <div ui-view></div>`
6	14	})
...	...	@@ -9,7 +17,7 @@ import {Component, StateConfig} from 'ng-forward';
9	17	url: '/',
10	18	component: Main2,
11	19	// templateUrl: "app/main/main.html",
12		- name: 'main2',
	20	+ name: 'main',
13	21	// resolve: {
14	22	// currentUser: function(AuthService) {
15	23	// return AuthService.loginFromCookie();
...	...	@@ -20,11 +28,3 @@ import {Component, StateConfig} from 'ng-forward';
20	28	export class Main {
21	29
22	30	}
23		-
24		-@Component({
25		- selector: 'Main2',
26		- template: `test main2`
27		-})
28		-export class Main2 {
29		-
30		-}
...	...
1	1	<acme-navbar></acme-navbar>
2	2	<div ui-view="content"></div>
3		-asdas dasd asdas d
...	...