diff --git a/src/app/admin/layout-edit/designMode.service.spec.ts b/src/app/admin/layout-edit/designMode.service.spec.ts index e88e429..8a48fb7 100644 --- a/src/app/admin/layout-edit/designMode.service.spec.ts +++ b/src/app/admin/layout-edit/designMode.service.spec.ts @@ -3,8 +3,7 @@ import {INoosferoLocalStorage} from "./../../shared/models/interfaces"; describe('DesignMode Service', () => { let service: DesignModeService; - - let $localStorage = { currentUser: null, settings: { designMode: false } }; + let $localStorage = { currentUser: null, settings: { designMode: false } }; beforeEach(() => { service = new DesignModeService($localStorage); }); @@ -32,4 +31,4 @@ describe('DesignMode Service', () => { service.setInDesignMode(false); expect(service.onToggle.next).not.toHaveBeenCalled(); }); -}); \ No newline at end of file +}); diff --git a/src/app/admin/layout-edit/designMode.service.ts b/src/app/admin/layout-edit/designMode.service.ts index 9f21c19..083c501 100644 --- a/src/app/admin/layout-edit/designMode.service.ts +++ b/src/app/admin/layout-edit/designMode.service.ts @@ -4,12 +4,13 @@ import {INoosferoLocalStorage} from "./../../shared/models/interfaces"; @Injectable() @Inject("$localStorage") export class DesignModeService { + @Output() onToggle: EventEmitter = new EventEmitter(); isInDesignMode(): boolean { return this.$localStorage.settings.designModeOn; } - + destroy() { delete this.$localStorage.settings; this.$localStorage.settings = {}; diff --git a/src/app/admin/layout-edit/designModeToggler.component.ts b/src/app/admin/layout-edit/designModeToggler.component.ts index 2224b56..2660902 100644 --- a/src/app/admin/layout-edit/designModeToggler.component.ts +++ b/src/app/admin/layout-edit/designModeToggler.component.ts @@ -1,6 +1,6 @@ import {Component, Inject} from 'ng-forward'; import {DesignModeService} from './designMode.service'; -import {AuthService, AuthEvents} from '../../login' +import {AuthService, AuthEvents} from '../../login'; @Component({ selector: 'noosfero-design-toggler', @@ -26,4 +26,4 @@ export class DesignModeTogglerComponent { set inDesignMode(value: boolean) { this.designModeService.setInDesignMode(value); }; -} \ No newline at end of file +} diff --git a/src/app/layout/blocks/block.component.spec.ts b/src/app/layout/blocks/block.component.spec.ts index 4be7937..1385325 100644 --- a/src/app/layout/blocks/block.component.spec.ts +++ b/src/app/layout/blocks/block.component.spec.ts @@ -43,7 +43,6 @@ describe("Boxes Component", () => { let blockService = jasmine.createSpyObj("blockService", ["update"]); let state = jasmine.createSpyObj("state", ["current"]); state.current = { name: "" }; - it("set isHomepage as false by default", () => { expect(helper.component.isHomepage).toBeFalsy(); diff --git a/src/app/layout/blocks/block.component.ts b/src/app/layout/blocks/block.component.ts index f9c7228..0b3c09c 100644 --- a/src/app/layout/blocks/block.component.ts +++ b/src/app/layout/blocks/block.component.ts @@ -11,8 +11,8 @@ import { DesignModeService } from "../../admin/layout-edit/designMode.service"; templateUrl: 'app/layout/blocks/block.html', directives: [BlockEditionComponent] }) -@Inject("$uibModal", "$scope", "$state", "$rootScope", BlockService, NotificationService, -AuthService, SessionService, TranslatorService, DesignModeService) +@Inject("$uibModal", "$scope", "$state", "$rootScope", BlockService, NotificationService, + AuthService, SessionService, TranslatorService, DesignModeService) export class BlockComponent { @Input() block: noosfero.Block; diff --git a/src/app/layout/services/body-state-classes.service.spec.ts b/src/app/layout/services/body-state-classes.service.spec.ts index b67cebb..452afb5 100644 --- a/src/app/layout/services/body-state-classes.service.spec.ts +++ b/src/app/layout/services/body-state-classes.service.spec.ts @@ -22,7 +22,6 @@ describe("BodyStateClasses Service", () => { authService: any = helpers.mocks.authService, bodyEl: { className: string }, bodyElJq: any, - designModeService = new DesignModeService($localStorage); @@ -177,7 +176,7 @@ describe("BodyStateClasses Service", () => { it("should add the class noosfero-design-on when designMode is changed to true", () => { let fnOnToggle: Function = null; - designModeService.onToggle = { + designModeService.onToggle = { subscribe: (fn: Function) => { fnOnToggle = fn; }, diff --git a/src/app/profile/custom-content/custom-content.component.ts b/src/app/profile/custom-content/custom-content.component.ts index 569fb0b..bea1a2a 100644 --- a/src/app/profile/custom-content/custom-content.component.ts +++ b/src/app/profile/custom-content/custom-content.component.ts @@ -12,7 +12,8 @@ import {DesignModeService} from '../../admin/layout-edit/designMode.service'; @Inject("$uibModal", "$scope", ProfileService, NotificationService, DesignModeService) export class CustomContentComponent { - static $inject = ["DesignModeService"]; // @Inject doesn't works with uibModal.open + // @Inject doesn't works with uibModal.open + static $inject = ["DesignModeService"]; @Input() attribute: string; @Input() profile: noosfero.Profile; @@ -35,7 +36,7 @@ export class CustomContentComponent { if (this.profile) this.content = (this.profile)[this.attribute]; }); } - + inEditMode() { return this.designModeService.isInDesignMode(); } -- libgit2 0.21.2