Browse Source

Renaming.

pull/380/head
Sebastian Stehle 7 years ago
parent
commit
0c3eb3cf71
  1. 12
      src/Squidex/app/framework/angular/modals/modal-view.directive.ts

12
src/Squidex/app/framework/angular/modals/modal-view.directive.ts

@ -20,7 +20,7 @@ import { RootViewComponent } from './root-view.component';
selector: '[sqxModalView]' selector: '[sqxModalView]'
}) })
export class ModalViewDirective implements OnChanges, OnDestroy, OnInit { export class ModalViewDirective implements OnChanges, OnDestroy, OnInit {
private subscription: Subscription | null = null; private modalSubscription: Subscription | null = null;
private documentClickCounterListener: Function | null = null; private documentClickCounterListener: Function | null = null;
private documentClickListener: Function | null = null; private documentClickListener: Function | null = null;
private renderedView: EmbeddedViewRef<any> | null = null; private renderedView: EmbeddedViewRef<any> | null = null;
@ -72,7 +72,7 @@ export class ModalViewDirective implements OnChanges, OnDestroy, OnInit {
this.unsubscribeToModal(); this.unsubscribeToModal();
if (Types.is(this.modalView, DialogModel) || Types.is(this.modalView, ModalModel)) { if (Types.is(this.modalView, DialogModel) || Types.is(this.modalView, ModalModel)) {
this.subscription = this.modalSubscription =
this.modalView.isOpen.subscribe(isOpen => { this.modalView.isOpen.subscribe(isOpen => {
this.update(isOpen); this.update(isOpen);
}); });
@ -121,8 +121,6 @@ export class ModalViewDirective implements OnChanges, OnDestroy, OnInit {
return; return;
} }
this.unsubscribeToClick();
this.documentClickListener = this.documentClickListener =
this.renderer.listen('document', 'click', (event: MouseEvent) => { this.renderer.listen('document', 'click', (event: MouseEvent) => {
if (!event.target || this.renderedView === null || this.clickCounter === clickCounter) { if (!event.target || this.renderedView === null || this.clickCounter === clickCounter) {
@ -155,9 +153,9 @@ export class ModalViewDirective implements OnChanges, OnDestroy, OnInit {
} }
private unsubscribeToModal() { private unsubscribeToModal() {
if (this.subscription) { if (this.modalSubscription) {
this.subscription.unsubscribe(); this.modalSubscription.unsubscribe();
this.subscription = null; this.modalSubscription = null;
} }
} }

Loading…
Cancel
Save