Download as
Browse Code »

Commit f6b323e12640e3a6863ad053e9505ab33f6cf596

Authored by Victor Costa
1 parent 2b9b97cb
Exists in master and in 35 other branches activities_block, btn-new-post, cleaning-the-house, cosmetic_changes_people_and_communities_block, coverage, edit-blocks, edit-header-footer, env-tags-block, forgot_password, header_and_footer, helpers-evolution, layout_support, list_articles_on_blog, loading-indicator-component, login_modal, login_modal_improve, person_info_block, profile-article-resolvers, profile-blocks-sass, profile-view, profile_description_block_component, profile_page_improvements, profile_search, recent-activities, remove-article-confirmation, responsive-fixes, seo, signup_page, skin-small-change, staging, tags-block, theme-skin-yellow, translations, updated_signup_page, users_profile_page

App bundle

Showing 3 changed files with 45 additions and 29 deletions   Show diff stats
src/app/index.module.ts
  Diff comments   View file @f6b323e
1 -import {Main} from "./main/main.controller";  
2 -  
3 export class NoosferoApp { 1 export class NoosferoApp {
4 2
5 - static appName: string = (<any>Main).name;  
6 -  
7 - static init() {  
8 - angular.module(NoosferoApp.appName, ["ngAnimate", "ngCookies", "ngStorage", "ngTouch",  
9 - "ngSanitize", "ngMessages", "ngAria", "restangular",  
10 - "ui.router", "ui.bootstrap", "toastr",  
11 - "angularMoment", "angular.filter", "akoenig.deckgrid",  
12 - "angular-timeline", "duScroll", "oitozero.ngSweetAlert"]);  
13 - } 3 + static appName: string = "noosferoApp";
  4 + static angularModule: any;
  5 + //static init(angularModule: any) {
  6 + //NoosferoApp.angularModule
  7 + // angular.module(NoosferoApp.appName, ["ngAnimate", "ngCookies", "ngStorage", "ngTouch",
  8 + // "ngSanitize", "ngMessages", "ngAria", "restangular",
  9 + // "ui.router", "ui.bootstrap", "toastr",
  10 + // "angularMoment", "angular.filter", "akoenig.deckgrid",
  11 + // "angular-timeline", "duScroll", "oitozero.ngSweetAlert"]);
  12 + //}
14 13
15 static addConfig(configFunc: Function) { 14 static addConfig(configFunc: Function) {
16 - angular.module(NoosferoApp.appName).config(configFunc); 15 + NoosferoApp.angularModule.config(configFunc);
17 } 16 }
18 17
19 static addConstants(constantName: string, value: any) { 18 static addConstants(constantName: string, value: any) {
20 - angular.module(NoosferoApp.appName).constant(constantName, value); 19 + NoosferoApp.angularModule.constant(constantName, value);
21 } 20 }
22 21
23 static addService(serviceName: string, value: any) { 22 static addService(serviceName: string, value: any) {
24 - angular.module(NoosferoApp.appName).service(serviceName, value); 23 + NoosferoApp.angularModule.service(serviceName, value);
25 } 24 }
26 25
27 static addController(controllerName: string, value: any) { 26 static addController(controllerName: string, value: any) {
28 - angular.module(NoosferoApp.appName).controller(controllerName, value); 27 + NoosferoApp.angularModule.controller(controllerName, value);
29 } 28 }
30 29
31 static run(runFunction: Function) { 30 static run(runFunction: Function) {
32 - angular.module(NoosferoApp.appName).run(runFunction); 31 + NoosferoApp.angularModule.run(runFunction);
33 } 32 }
34 } 33 }
src/app/index.ts
  Diff comments   View file @f6b323e
@@ -5,23 +5,35 @@ import {noosferoAngularRunBlock} from &quot;./index.run&quot;; @@ -5,23 +5,35 @@ import {noosferoAngularRunBlock} from &quot;./index.run&quot;;
5 import {routeConfig} from "./index.route"; 5 import {routeConfig} from "./index.route";
6 import {ContentViewerController} from "./content-viewer/content-viewer.controller"; 6 import {ContentViewerController} from "./content-viewer/content-viewer.controller";
7 import {Main} from "./main/main.controller"; 7 import {Main} from "./main/main.controller";
8 -import {bootstrap} from 'ng-forward'; 8 +import {bootstrap, bundle} from 'ng-forward';
9 9
10 declare var moment: any; 10 declare var moment: any;
11 11
12 -// NoosferoApp.init(); 12 +let noosferoApp: any = bundle("noosferoApp", Main, ["ngAnimate", "ngCookies", "ngStorage", "ngTouch",
  13 + "ngSanitize", "ngMessages", "ngAria", "restangular",
  14 + "ui.router", "ui.bootstrap", "toastr",
  15 + "angularMoment", "angular.filter", "akoenig.deckgrid",
  16 + "angular-timeline", "duScroll", "oitozero.ngSweetAlert"]).publish();
  17 +console.log(noosferoApp);
  18 +// bootstrap(Main, noosferoApp.requires);
  19 +
  20 +NoosferoApp.angularModule = noosferoApp;
13 // 21 //
14 -// NoosferoApp.addConstants("moment", moment);  
15 -// NoosferoApp.addConstants("AUTH_EVENTS", {  
16 -// loginSuccess: "auth-login-success",  
17 -// loginFailed: "auth-login-failed",  
18 -// logoutSuccess: "auth-logout-success"  
19 -// }); 22 +NoosferoApp.addConstants("moment", moment);
  23 +NoosferoApp.addConstants("AUTH_EVENTS", {
  24 + loginSuccess: "auth-login-success",
  25 + loginFailed: "auth-login-failed",
  26 + logoutSuccess: "auth-logout-success"
  27 +});
20 // 28 //
21 // 29 //
22 -// NoosferoApp.addConfig(noosferoModuleConfig); 30 +NoosferoApp.addConfig(noosferoModuleConfig);
23 // 31 //
24 -// NoosferoApp.run(noosferoAngularRunBlock); 32 +NoosferoApp.run(noosferoAngularRunBlock);
  33 +
  34 +noosferoApp.run(() => {
  35 + console.log("RUN!");
  36 +});
25 37
26 // // require("./main/main.controller.js"); 38 // // require("./main/main.controller.js");
27 // require("./cms/cms.controller.js"); 39 // require("./cms/cms.controller.js");
@@ -51,4 +63,6 @@ declare var moment: any; @@ -51,4 +63,6 @@ declare var moment: any;
51 63
52 // NoosferoApp.addConfig(routeConfig); 64 // NoosferoApp.addConfig(routeConfig);
53 65
54 -console.log(bootstrap(Main, ['ui.router'])); 66 +
  67 +
  68 +//bootstrap(Main, ['ui.router']);
src/app/main/main.controller.ts
  Diff comments   View file @f6b323e
1 -import {Component, StateConfig} from 'ng-forward'; 1 +import {bundle, Component, StateConfig} from 'ng-forward';
2 2
3 @Component({ 3 @Component({
4 selector: 'main2', 4 selector: 'main2',
@@ -10,7 +10,7 @@ export class Main2 { @@ -10,7 +10,7 @@ export class Main2 {
10 10
11 @Component({ 11 @Component({
12 selector: 'main', 12 selector: 'main',
13 - template: `aaaa <div ui-view></div>` 13 + template: `aaaa <ui-view></ui-view>`
14 }) 14 })
15 @StateConfig([ 15 @StateConfig([
16 { 16 {
@@ -28,3 +28,6 @@ export class Main2 { @@ -28,3 +28,6 @@ export class Main2 {
28 export class Main { 28 export class Main {
29 29
30 } 30 }
  31 +
  32 +// bundle('noosferoApp', Main2).publish();
  33 +// bundle('noosferoApp', Main).publish();