diff --git a/src/app/index.module.ts b/src/app/index.module.ts index 5ee791e..db50d6b 100644 --- a/src/app/index.module.ts +++ b/src/app/index.module.ts @@ -1,6 +1,8 @@ +import {Main} from "./main/main.controller"; + export class NoosferoApp { - static appName: string = "noosferoApp"; + static appName: string = (Main).name; static init() { angular.module(NoosferoApp.appName, ["ngAnimate", "ngCookies", "ngStorage", "ngTouch", diff --git a/src/app/index.ts b/src/app/index.ts index c090dd1..ab2279c 100644 --- a/src/app/index.ts +++ b/src/app/index.ts @@ -51,4 +51,4 @@ declare var moment: any; // NoosferoApp.addConfig(routeConfig); -bootstrap(Main, ['ui.router']); +console.log(bootstrap(Main, ['ui.router'])); diff --git a/src/app/main/main.controller.ts b/src/app/main/main.controller.ts index 7ad0574..df35274 100644 --- a/src/app/main/main.controller.ts +++ b/src/app/main/main.controller.ts @@ -1,6 +1,14 @@ import {Component, StateConfig} from 'ng-forward'; @Component({ + selector: 'main2', + template: `test main2` +}) +export class Main2 { + +} + +@Component({ selector: 'main', template: `aaaa
` }) @@ -9,7 +17,7 @@ import {Component, StateConfig} from 'ng-forward'; 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 'ng-forward'; export class Main { } - -@Component({ - selector: 'Main2', - template: `test main2` -}) -export class Main2 { - -} diff --git a/src/app/main/main.html b/src/app/main/main.html index 03fc215..6a7ff04 100644 --- a/src/app/main/main.html +++ b/src/app/main/main.html @@ -1,3 +1,2 @@
-asdas dasd asdas d -- libgit2 0.21.2