Fixed design mode state

Carlos Purificação
1 parent f75c68d0
Showing 3 changed files with 14 additions and 7 deletions Show diff stats
src/app/admin/layout-edit/designMode.service.ts
src/app/login/session.service.ts
src/app/shared/models/interfaces.ts
-import {Injectable, Output, EventEmitter} from 'ng-forward';
+import {Injectable, Output, EventEmitter, Inject} from 'ng-forward';
+import {INoosferoLocalStorage} from "./../../shared/models/interfaces";
  
 @Injectable()
+@Inject("$localStorage")
 export class DesignModeService {
     @Output() onToggle: EventEmitter<boolean> = new EventEmitter<boolean>();
  
-    private designModeOn: boolean = false;
+    //private designModeOn: boolean = false;
  
     isInDesignMode(): boolean {
-        return this.designModeOn;
+        return this.$localStorage.settings.designModeOn;
     }
  
     setInDesignMode(value: boolean) {
-        if (this.designModeOn !== value) {
-            this.designModeOn = value;
-            this.onToggle.next(this.designModeOn);
+        if (this.$localStorage.settings.designModeOn !== value) {
+            this.$localStorage.settings.designModeOn = value;
+            this.onToggle.next(value);
         }
     }
  
-    constructor() {
+    constructor(private $localStorage: INoosferoLocalStorage) {
+        if (!this.$localStorage.settings) {
+            this.$localStorage.settings = {};
+        }
     }
 }
@@ -16,6 +16,7 @@ export class SessionService {
  
     destroy() {
         delete this.$localStorage.currentUser;
+        delete this.$localStorage.settings;
     };
  
     currentUser(): noosfero.User {
@@ -8,4 +8,5 @@ export interface UserResponse {
  
 export interface INoosferoLocalStorage extends angular.storage.ILocalStorageService {
     currentUser: noosfero.User;
+    settings: any;
 }
1		-import {Injectable, Output, EventEmitter} from 'ng-forward';
	1	+import {Injectable, Output, EventEmitter, Inject} from 'ng-forward';
	2	+import {INoosferoLocalStorage} from "./../../shared/models/interfaces";
2	3
3	4	@Injectable()
	5	+@Inject("$localStorage")
4	6	export class DesignModeService {
5	7	@Output() onToggle: EventEmitter<boolean> = new EventEmitter<boolean>();
6	8
7		- private designModeOn: boolean = false;
	9	+ //private designModeOn: boolean = false;
8	10
9	11	isInDesignMode(): boolean {
10		- return this.designModeOn;
	12	+ return this.$localStorage.settings.designModeOn;
11	13	}
12	14
13	15	setInDesignMode(value: boolean) {
14		- if (this.designModeOn !== value) {
15		- this.designModeOn = value;
16		- this.onToggle.next(this.designModeOn);
	16	+ if (this.$localStorage.settings.designModeOn !== value) {
	17	+ this.$localStorage.settings.designModeOn = value;
	18	+ this.onToggle.next(value);
17	19	}
18	20	}
19	21
20		- constructor() {
	22	+ constructor(private $localStorage: INoosferoLocalStorage) {
	23	+ if (!this.$localStorage.settings) {
	24	+ this.$localStorage.settings = {};
	25	+ }
21	26	}
22	27	}
...	...
...	...	@@ -16,6 +16,7 @@ export class SessionService {
16	16
17	17	destroy() {
18	18	delete this.$localStorage.currentUser;
	19	+ delete this.$localStorage.settings;
19	20	};
20	21
21	22	currentUser(): noosfero.User {
...	...
...	...	@@ -8,4 +8,5 @@ export interface UserResponse {
8	8
9	9	export interface INoosferoLocalStorage extends angular.storage.ILocalStorageService {
10	10	currentUser: noosfero.User;
	11	+ settings: any;
11	12	}
...	...