From f6b323e12640e3a6863ad053e9505ab33f6cf596 Mon Sep 17 00:00:00 2001
From: Victor Costa <vfcosta@gmail.com>
Date: Thu, 25 Feb 2016 18:29:37 -0300
Subject: [PATCH] App bundle

---
 src/app/index.module.ts         | 31 +++++++++++++++----------------
 src/app/index.ts                | 36 +++++++++++++++++++++++++-----------
 src/app/main/main.controller.ts |  7 +++++--
 3 files changed, 45 insertions(+), 29 deletions(-)

diff --git a/src/app/index.module.ts b/src/app/index.module.ts
index db50d6b..dd154bf 100644
--- a/src/app/index.module.ts
+++ b/src/app/index.module.ts
@@ -1,34 +1,33 @@
-import {Main} from "./main/main.controller";
-
 export class NoosferoApp {
 
-    static appName: string = (<any>Main).name;
-
-    static init() {
-        angular.module(NoosferoApp.appName, ["ngAnimate", "ngCookies", "ngStorage", "ngTouch",
-            "ngSanitize", "ngMessages", "ngAria", "restangular",
-            "ui.router", "ui.bootstrap", "toastr",
-            "angularMoment", "angular.filter", "akoenig.deckgrid",
-            "angular-timeline", "duScroll", "oitozero.ngSweetAlert"]);
-    }
+    static appName: string = "noosferoApp";
+    static angularModule: any;
+    //static init(angularModule: any) {
+    //NoosferoApp.angularModule
+    // angular.module(NoosferoApp.appName, ["ngAnimate", "ngCookies", "ngStorage", "ngTouch",
+    //     "ngSanitize", "ngMessages", "ngAria", "restangular",
+    //     "ui.router", "ui.bootstrap", "toastr",
+    //     "angularMoment", "angular.filter", "akoenig.deckgrid",
+    //     "angular-timeline", "duScroll", "oitozero.ngSweetAlert"]);
+    //}
 
     static addConfig(configFunc: Function) {
-        angular.module(NoosferoApp.appName).config(configFunc);
+        NoosferoApp.angularModule.config(configFunc);
     }
 
     static addConstants(constantName: string, value: any) {
-        angular.module(NoosferoApp.appName).constant(constantName, value);
+        NoosferoApp.angularModule.constant(constantName, value);
     }
 
     static addService(serviceName: string, value: any) {
-        angular.module(NoosferoApp.appName).service(serviceName, value);
+        NoosferoApp.angularModule.service(serviceName, value);
     }
 
     static addController(controllerName: string, value: any) {
-        angular.module(NoosferoApp.appName).controller(controllerName, value);
+        NoosferoApp.angularModule.controller(controllerName, value);
     }
 
     static run(runFunction: Function) {
-        angular.module(NoosferoApp.appName).run(runFunction);
+        NoosferoApp.angularModule.run(runFunction);
     }
 }
diff --git a/src/app/index.ts b/src/app/index.ts
index ab2279c..744ca9e 100644
--- a/src/app/index.ts
+++ b/src/app/index.ts
@@ -5,23 +5,35 @@ import {noosferoAngularRunBlock} from "./index.run";
 import {routeConfig} from "./index.route";
 import {ContentViewerController} from "./content-viewer/content-viewer.controller";
 import {Main} from "./main/main.controller";
-import {bootstrap} from 'ng-forward';
+import {bootstrap, bundle} from 'ng-forward';
 
 declare var moment: any;
 
-// NoosferoApp.init();
+let noosferoApp: any = bundle("noosferoApp", Main, ["ngAnimate", "ngCookies", "ngStorage", "ngTouch",
+    "ngSanitize", "ngMessages", "ngAria", "restangular",
+    "ui.router", "ui.bootstrap", "toastr",
+    "angularMoment", "angular.filter", "akoenig.deckgrid",
+    "angular-timeline", "duScroll", "oitozero.ngSweetAlert"]).publish();
+console.log(noosferoApp);
+// bootstrap(Main, noosferoApp.requires);
+
+NoosferoApp.angularModule = noosferoApp;
 // 
-// NoosferoApp.addConstants("moment", moment);
-// NoosferoApp.addConstants("AUTH_EVENTS", {
-//     loginSuccess: "auth-login-success",
-//     loginFailed: "auth-login-failed",
-//     logoutSuccess: "auth-logout-success"
-// });
+NoosferoApp.addConstants("moment", moment);
+NoosferoApp.addConstants("AUTH_EVENTS", {
+    loginSuccess: "auth-login-success",
+    loginFailed: "auth-login-failed",
+    logoutSuccess: "auth-logout-success"
+});
 // 
 // 
-// NoosferoApp.addConfig(noosferoModuleConfig);
+NoosferoApp.addConfig(noosferoModuleConfig);
 // 
-// NoosferoApp.run(noosferoAngularRunBlock);
+NoosferoApp.run(noosferoAngularRunBlock);
+
+noosferoApp.run(() => {
+    console.log("RUN!");
+});
 
 // // require("./main/main.controller.js");
 // require("./cms/cms.controller.js");
@@ -51,4 +63,6 @@ declare var moment: any;
 
 // NoosferoApp.addConfig(routeConfig);
 
-console.log(bootstrap(Main, ['ui.router']));
+
+
+//bootstrap(Main, ['ui.router']);
diff --git a/src/app/main/main.controller.ts b/src/app/main/main.controller.ts
index df35274..b6c958e 100644
--- a/src/app/main/main.controller.ts
+++ b/src/app/main/main.controller.ts
@@ -1,4 +1,4 @@
-import {Component, StateConfig} from 'ng-forward';
+import {bundle, Component, StateConfig} from 'ng-forward';
 
 @Component({
     selector: 'main2',
@@ -10,7 +10,7 @@ export class Main2 {
 
 @Component({
     selector: 'main',
-    template: `aaaa <div ui-view></div>`
+    template: `aaaa <ui-view></ui-view>`
 })
 @StateConfig([
     {
@@ -28,3 +28,6 @@ export class Main2 {
 export class Main {
 
 }
+
+// bundle('noosferoApp', Main2).publish();
+// bundle('noosferoApp', Main).publish(); 
--
libgit2 0.21.2