From 0c3eb3cf715050d130f23bb5baa78659e142acde Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Fri, 28 Jun 2019 19:32:45 +0200 Subject: [PATCH] Renaming. --- .../framework/angular/modals/modal-view.directive.ts | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/Squidex/app/framework/angular/modals/modal-view.directive.ts b/src/Squidex/app/framework/angular/modals/modal-view.directive.ts index 38b2e5d79..b8a72d87f 100644 --- a/src/Squidex/app/framework/angular/modals/modal-view.directive.ts +++ b/src/Squidex/app/framework/angular/modals/modal-view.directive.ts @@ -20,7 +20,7 @@ import { RootViewComponent } from './root-view.component'; selector: '[sqxModalView]' }) export class ModalViewDirective implements OnChanges, OnDestroy, OnInit { - private subscription: Subscription | null = null; + private modalSubscription: Subscription | null = null; private documentClickCounterListener: Function | null = null; private documentClickListener: Function | null = null; private renderedView: EmbeddedViewRef | null = null; @@ -72,7 +72,7 @@ export class ModalViewDirective implements OnChanges, OnDestroy, OnInit { this.unsubscribeToModal(); if (Types.is(this.modalView, DialogModel) || Types.is(this.modalView, ModalModel)) { - this.subscription = + this.modalSubscription = this.modalView.isOpen.subscribe(isOpen => { this.update(isOpen); }); @@ -121,8 +121,6 @@ export class ModalViewDirective implements OnChanges, OnDestroy, OnInit { return; } - this.unsubscribeToClick(); - this.documentClickListener = this.renderer.listen('document', 'click', (event: MouseEvent) => { if (!event.target || this.renderedView === null || this.clickCounter === clickCounter) { @@ -155,9 +153,9 @@ export class ModalViewDirective implements OnChanges, OnDestroy, OnInit { } private unsubscribeToModal() { - if (this.subscription) { - this.subscription.unsubscribe(); - this.subscription = null; + if (this.modalSubscription) { + this.modalSubscription.unsubscribe(); + this.modalSubscription = null; } }