Browse Source

Confirm click fix.

pull/567/head
Sebastian 5 years ago
parent
commit
b8979f860a
  1. 43
      frontend/app/framework/angular/forms/confirm-click.directive.ts

43
frontend/app/framework/angular/forms/confirm-click.directive.ts

@ -7,16 +7,15 @@
// tslint:disable: readonly-array // tslint:disable: readonly-array
import { Directive, EventEmitter, HostListener, Input, OnDestroy, Output } from '@angular/core'; import { Directive, EventEmitter, HostListener, Input, Output } from '@angular/core';
import { DialogService } from '@app/framework/internal'; import { DialogService } from '@app/framework/internal';
import { Subscriber } from 'rxjs';
import { take } from 'rxjs/operators';
@Directive({ @Directive({
selector: '[sqxConfirmClick]' selector: '[sqxConfirmClick]'
}) })
export class ConfirmClickDirective implements OnDestroy { export class ConfirmClickDirective {
private isOpen = false;
private isDestroyed = false;
@Input() @Input()
public confirmTitle: string; public confirmTitle: string;
@ -37,14 +36,6 @@ export class ConfirmClickDirective implements OnDestroy {
) { ) {
} }
public ngOnDestroy() {
this.isDestroyed = true;
if (!this.isOpen) {
this.clickConfirmed.complete();
}
}
@HostListener('click', ['$event']) @HostListener('click', ['$event'])
public onClick(event: Event) { public onClick(event: Event) {
if (this.confirmRequired && if (this.confirmRequired &&
@ -53,25 +44,23 @@ export class ConfirmClickDirective implements OnDestroy {
this.confirmText && this.confirmText &&
this.confirmText.length > 0) { this.confirmText.length > 0) {
this.isOpen = true; const observers = [...this.clickConfirmed.observers];
this.beforeClick.emit(); this.beforeClick.emit();
const subscription = this.dialogs.confirm(this.confirmTitle, this.confirmText).pipe(take(1))
this.dialogs.confirm(this.confirmTitle, this.confirmText) .subscribe(confirmed => {
.subscribe(confirmed => { if (confirmed) {
this.isOpen = false; for (const observer of observers) {
const subscriber = observer as Subscriber<any>;
if (confirmed) {
this.clickConfirmed.emit();
}
subscription.unsubscribe();
if (this.isDestroyed) { if (subscriber['destination']) {
this.clickConfirmed.complete(); subscriber['destination'].next!(true);
subscriber['destination'].complete!();
}
} }
}); }
});
} else { } else {
this.clickConfirmed.emit(); this.clickConfirmed.emit();
} }

Loading…
Cancel
Save