diff --git a/src/app/admin/layout-edit/designMode.service.ts b/src/app/admin/layout-edit/designMode.service.ts index bdfc64a..e71db1a 100644 --- a/src/app/admin/layout-edit/designMode.service.ts +++ b/src/app/admin/layout-edit/designMode.service.ts @@ -6,11 +6,13 @@ import {INoosferoLocalStorage} from "./../../shared/models/interfaces"; export class DesignModeService { @Output() onToggle: EventEmitter = new EventEmitter(); - //private designModeOn: boolean = false; - isInDesignMode(): boolean { return this.$localStorage.settings.designModeOn; } + + destroy() { + this.$localStorage.settings = {}; + } setInDesignMode(value: boolean) { if (this.$localStorage.settings.designModeOn !== value) { diff --git a/src/app/admin/layout-edit/designModeToggler.component.spec.ts b/src/app/admin/layout-edit/designModeToggler.component.spec.ts index 951d956..b131175 100644 --- a/src/app/admin/layout-edit/designModeToggler.component.spec.ts +++ b/src/app/admin/layout-edit/designModeToggler.component.spec.ts @@ -22,7 +22,8 @@ describe('DesignModeToggler Component', () => { template: htmlTemplate, directives: [DesignModeTogglerComponent], providers: [ - helpers.createProviderToValue('DesignModeService', designModeService) + helpers.createProviderToValue('DesignModeService', designModeService), + helpers.createProviderToValue('AuthService', helpers.mocks.authService), ] }); helper = new ComponentTestHelper(cls, done); diff --git a/src/app/admin/layout-edit/designModeToggler.component.ts b/src/app/admin/layout-edit/designModeToggler.component.ts index aefde58..2224b56 100644 --- a/src/app/admin/layout-edit/designModeToggler.component.ts +++ b/src/app/admin/layout-edit/designModeToggler.component.ts @@ -1,15 +1,20 @@ import {Component, Inject} from 'ng-forward'; import {DesignModeService} from './designMode.service'; +import {AuthService, AuthEvents} from '../../login' + @Component({ selector: 'noosfero-design-toggler', templateUrl: 'app/admin/layout-edit/designModeToggler.html' }) -@Inject(DesignModeService) +@Inject(DesignModeService, AuthService) export class DesignModeTogglerComponent { icon: string = "  "; - constructor(private designModeService: DesignModeService) { + constructor(private designModeService: DesignModeService, private authService: AuthService) { + this.authService.subscribe(AuthEvents[AuthEvents.logoutSuccess], () => { + this.designModeService.destroy(); + }); } private _inDesignMode: boolean = false; diff --git a/src/app/profile/custom-content/custom-content.component.spec.ts b/src/app/profile/custom-content/custom-content.component.spec.ts index 58c31bc..c0b26e9 100644 --- a/src/app/profile/custom-content/custom-content.component.spec.ts +++ b/src/app/profile/custom-content/custom-content.component.spec.ts @@ -25,7 +25,6 @@ describe("Components", () => { helpers.createProviderToValue("$uibModal", helpers.mocks.$modal), helpers.createProviderToValue("ProfileService", profileService), helpers.createProviderToValue("NotificationService", notificationService), - //helpers.createProviderToValue("DesignModeService", helpers.mocks.designModeService) helpers.createProviderToValue("DesignModeService", designModeService) ] }); -- libgit2 0.21.2