From a4e6d1f3d74894c262f9ca5edd5776ae7b8c870f Mon Sep 17 00:00:00 2001
From: Michel Felipe <mfelipeof@gmail.com>
Date: Tue, 5 Jul 2016 10:11:35 -0300
Subject: [PATCH] Fix master rebase @Inject() values

---
 src/app/admin/layout-edit/designModeToggler.component.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/app/admin/layout-edit/designModeToggler.component.ts b/src/app/admin/layout-edit/designModeToggler.component.ts
index 6f1ffb2..61b8e21 100644
--- a/src/app/admin/layout-edit/designModeToggler.component.ts
+++ b/src/app/admin/layout-edit/designModeToggler.component.ts
@@ -1,4 +1,4 @@
-import {Component, Inject} from 'ng-forward';
+import {Component, Inject, Input} from 'ng-forward';
 import {DesignModeService} from './designMode.service';
 import {AuthService, AuthEvents} from '../../login';
 
@@ -6,7 +6,7 @@ import {AuthService, AuthEvents} from '../../login';
     selector: 'noosfero-design-toggler',
     templateUrl: 'app/admin/layout-edit/designModeToggler.html'
 })
-@Inject(DesignModeService)
+@Inject(DesignModeService, AuthService, '$sce')
 export class DesignModeTogglerComponent {
 
     @Input() iconClass: string = '';
@@ -14,16 +14,16 @@ export class DesignModeTogglerComponent {
     @Input() offLabel: string = '';
     @Input() onLabel: string = '';
 
-	private _inDesignMode: boolean = false;
+    private _inDesignMode: boolean = false;
 
-    constructor(private designModeService: DesignModeService, private authService: AuthService,  private $sce: ng.ISCEService) {
+    constructor(private designModeService: DesignModeService, private authService: AuthService, private $sce: ng.ISCEService) {
         this.authService.subscribe(AuthEvents[AuthEvents.logoutSuccess], () => {
             this.designModeService.destroy();
         });
     }
 
     get icon(): string {
-        if (this.iconClass && this.iconClass.trim().length > 0 ) {
+        if (this.iconClass && this.iconClass.trim().length > 0) {
             return '<i class=\'design-toggle-icon ' + this.iconClass + '\'></i>';
         }
         else {
@@ -42,4 +42,4 @@ export class DesignModeTogglerComponent {
     set inDesignMode(value: boolean) {
         this.designModeService.setInDesignMode(value);
     };
-}
\ No newline at end of file
+}
--
libgit2 0.21.2