Download as
Browse Code »

Commit e882651c1e796212ec76c198a8767ebdcae60310

Authored by ABNER SILVA DE OLIVEIRA
2 parents 28a3d3f6 8a357aae
Exists in master and in 34 other branches activities_block, btn-new-post, cleaning-the-house, cosmetic_changes_people_and_communities_block, 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

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

Showing 2 changed files with 2 additions and 6 deletions   Show diff stats
src/app/components/navbar/navbar.ts
  Diff comments   View file @e882651
1 import {Component, Inject} from "ng-forward"; 1 import {Component, Inject} from "ng-forward";
2 2
3 3
4 -import {Session, AuthService, IAuthEvents} from "./../auth"; 4 +import {Session, AuthService, AuthController, IAuthEvents} from "./../auth";
5 import {User} from "./../../models/interfaces"; 5 import {User} from "./../../models/interfaces";
6 6
7 @Component({ 7 @Component({
@@ -46,7 +46,7 @@ export class Navbar { @@ -46,7 +46,7 @@ export class Navbar {
46 openLogin() { 46 openLogin() {
47 this.modalInstance = this.$modal.open({ 47 this.modalInstance = this.$modal.open({
48 templateUrl: 'app/components/auth/login.html', 48 templateUrl: 'app/components/auth/login.html',
49 - controller: 'AuthController', 49 + controller: AuthController,
50 controllerAs: 'vm', 50 controllerAs: 'vm',
51 bindToController: true 51 bindToController: true
52 }); 52 });
src/app/index.ts
  Diff comments   View file @e882651
@@ -28,10 +28,6 @@ NoosferoApp.addConstants("AUTH_EVENTS", AUTH_EVENTS); @@ -28,10 +28,6 @@ NoosferoApp.addConstants("AUTH_EVENTS", AUTH_EVENTS);
28 NoosferoApp.addConfig(noosferoModuleConfig); 28 NoosferoApp.addConfig(noosferoModuleConfig);
29 NoosferoApp.run(noosferoAngularRunBlock); 29 NoosferoApp.run(noosferoAngularRunBlock);
30 30
31 -// NoosferoApp.addService("Session", Session);  
32 -// NoosferoApp.addService("AuthService", AuthService);  
33 -NoosferoApp.addController("AuthController", AuthController);  
34 -  
35 require("./components/noosfero/noosfero.service.js"); 31 require("./components/noosfero/noosfero.service.js");
36 require("./components/noosfero/profile-image/profile-image.component.js"); 32 require("./components/noosfero/profile-image/profile-image.component.js");
37 33