Commit dc402730c82b02621c0c3504fcea8499515b0ae3
1 parent
ec0140bc
Exists in
master
and in
14 other branches
fixed typos in method and attributes names
Showing
3 changed files
with
11 additions
and
10 deletions
Show diff stats
src/app/layout/navbar/navbar.html
1 | <nav class="navbar navbar-static-top navbar-inverse"> | 1 | <nav class="navbar navbar-static-top navbar-inverse"> |
2 | <div class="container-fluid"> | 2 | <div class="container-fluid"> |
3 | <div class="navbar-header"> | 3 | <div class="navbar-header"> |
4 | - <button type="button" class="navbar-toggle collapsed" (click)="ctrl.toggleCollapse()" ng-show="ctrl.showHamburguer"> | 4 | + <button type="button" class="navbar-toggle collapsed" (click)="ctrl.toggleCollapse()" ng-show="ctrl.showHamburger"> |
5 | <span class="sr-only">{{"navbar.toggle_menu" | translate}}</span> | 5 | <span class="sr-only">{{"navbar.toggle_menu" | translate}}</span> |
6 | <i class="fa fa-bars"></i> | 6 | <i class="fa fa-bars"></i> |
7 | </button> | 7 | </button> |
src/app/layout/navbar/navbar.ts
@@ -16,7 +16,7 @@ export class Navbar { | @@ -16,7 +16,7 @@ export class Navbar { | ||
16 | 16 | ||
17 | private currentUser: noosfero.User; | 17 | private currentUser: noosfero.User; |
18 | private modalInstance: any = null; | 18 | private modalInstance: any = null; |
19 | - public showHamburguer: boolean = false; | 19 | + public showHamburger: boolean = false; |
20 | public currentEnvironment: noosfero.Environment = <any>{ name: '' }; | 20 | public currentEnvironment: noosfero.Environment = <any>{ name: '' }; |
21 | 21 | ||
22 | /** | 22 | /** |
@@ -32,9 +32,9 @@ export class Navbar { | @@ -32,9 +32,9 @@ export class Navbar { | ||
32 | private environmentService: EnvironmentService | 32 | private environmentService: EnvironmentService |
33 | ) { | 33 | ) { |
34 | this.currentUser = this.session.currentUser(); | 34 | this.currentUser = this.session.currentUser(); |
35 | - this.currentEnvironment = environmentService.getCurrentEnviroment(); | 35 | + this.currentEnvironment = environmentService.getCurrentEnvironment(); |
36 | 36 | ||
37 | - this.showHamburguer = this.authService.isAuthenticated(); | 37 | + this.showHamburger = this.authService.isAuthenticated(); |
38 | this.bodyStateService.addContentClass(!this.sidebarNotificationService.sidebarVisible); | 38 | this.bodyStateService.addContentClass(!this.sidebarNotificationService.sidebarVisible); |
39 | 39 | ||
40 | this.authService.subscribe(AuthEvents[AuthEvents.loginSuccess], () => { | 40 | this.authService.subscribe(AuthEvents[AuthEvents.loginSuccess], () => { |
@@ -44,7 +44,7 @@ export class Navbar { | @@ -44,7 +44,7 @@ export class Navbar { | ||
44 | } | 44 | } |
45 | 45 | ||
46 | this.currentUser = this.session.currentUser(); | 46 | this.currentUser = this.session.currentUser(); |
47 | - this.showHamburguer = true; | 47 | + this.showHamburger = true; |
48 | 48 | ||
49 | this.$state.go(this.$state.current, {}, { reload: true }); // TODO move to auth | 49 | this.$state.go(this.$state.current, {}, { reload: true }); // TODO move to auth |
50 | }); | 50 | }); |
src/lib/ng-noosfero-api/http/environment.service.ts
@@ -10,10 +10,11 @@ export class EnvironmentService { | @@ -10,10 +10,11 @@ export class EnvironmentService { | ||
10 | 10 | ||
11 | } | 11 | } |
12 | 12 | ||
13 | - getCurrentEnviroment(): noosfero.Environment { | 13 | + getCurrentEnvironment(): noosfero.Environment { |
14 | return this.currentEnvironment; | 14 | return this.currentEnvironment; |
15 | } | 15 | } |
16 | 16 | ||
17 | + | ||
17 | getEnvironmentPeople(params: any): ng.IPromise<noosfero.Person[]> { | 18 | getEnvironmentPeople(params: any): ng.IPromise<noosfero.Person[]> { |
18 | let p = this.restangular.one('people').get(params); | 19 | let p = this.restangular.one('people').get(params); |
19 | let deferred = this.$q.defer<noosfero.Person[]>(); | 20 | let deferred = this.$q.defer<noosfero.Person[]>(); |
@@ -49,7 +50,7 @@ export class EnvironmentService { | @@ -49,7 +50,7 @@ export class EnvironmentService { | ||
49 | 50 | ||
50 | /** TODO - Please, use the base class RestangularService | 51 | /** TODO - Please, use the base class RestangularService |
51 | * (description) | 52 | * (description) |
52 | - * | 53 | + * |
53 | * @template T_currentEnvironmentPromise | 54 | * @template T_currentEnvironmentPromise |
54 | * @param {ng.IDeferred<T>} deferred (description) | 55 | * @param {ng.IDeferred<T>} deferred (description) |
55 | * @returns {(response: restangular.IResponse) => void} (description) | 56 | * @returns {(response: restangular.IResponse) => void} (description) |
@@ -58,7 +59,7 @@ export class EnvironmentService { | @@ -58,7 +59,7 @@ export class EnvironmentService { | ||
58 | let self = this; | 59 | let self = this; |
59 | /** | 60 | /** |
60 | * (description) | 61 | * (description) |
61 | - * | 62 | + * |
62 | * @param {restangular.IResponse} response (description) | 63 | * @param {restangular.IResponse} response (description) |
63 | */ | 64 | */ |
64 | let errorFunction = (response: restangular.IResponse): void => { | 65 | let errorFunction = (response: restangular.IResponse): void => { |
@@ -75,7 +76,7 @@ export class EnvironmentService { | @@ -75,7 +76,7 @@ export class EnvironmentService { | ||
75 | 76 | ||
76 | /** | 77 | /** |
77 | * (description) | 78 | * (description) |
78 | - * | 79 | + * |
79 | * @param {restangular.IResponse} response (description) | 80 | * @param {restangular.IResponse} response (description) |
80 | */ | 81 | */ |
81 | let successFunction = (response: restangular.IResponse): void => { | 82 | let successFunction = (response: restangular.IResponse): void => { |
@@ -93,7 +94,7 @@ export class EnvironmentService { | @@ -93,7 +94,7 @@ export class EnvironmentService { | ||
93 | 94 | ||
94 | /** | 95 | /** |
95 | * (description) | 96 | * (description) |
96 | - * | 97 | + * |
97 | * @param {restangular.IResponse} response (description) | 98 | * @param {restangular.IResponse} response (description) |
98 | */ | 99 | */ |
99 | let successFunction = (response: restangular.IResponse): void => { | 100 | let successFunction = (response: restangular.IResponse): void => { |