paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-10-28 03:46:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
Michael Shamoon
2022-02-15 23:43:02 -08:00
parent 4a9844d64b
commit c5c2257ff0
2 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src-ui/src/app/components/app-frame/app-frame.component.ts
View File

@@ -1,4 +1,4 @@
import { Component, OnInit } from '@angular/core'; import { Component } from '@angular/core';
import { FormControl } from '@angular/forms'; import { FormControl } from '@angular/forms';
import { ActivatedRoute, Router, Params } from '@angular/router'; import { ActivatedRoute, Router, Params } from '@angular/router';
import { from, Observable, Subscription, BehaviorSubject } from 'rxjs'; import { from, Observable, Subscription, BehaviorSubject } from 'rxjs';
@@ -18,7 +18,7 @@ import { FILTER_FULLTEXT_QUERY } from 'src/app/data/filter-rule-type';
templateUrl: './app-frame.component.html', templateUrl: './app-frame.component.html',
styleUrls: ['./app-frame.component.scss'] styleUrls: ['./app-frame.component.scss']
}) })
export class AppFrameComponent implements OnInit { export class AppFrameComponent {
constructor ( constructor (
public router: Router, public router: Router,
@@ -102,14 +102,13 @@ export class AppFrameComponent implements OnInit {
while (route.firstChild) { while (route.firstChild) {
route = route.firstChild route = route.firstChild
} }
if (route.component == DocumentDetailComponent) { if (route.component === DocumentDetailComponent) {
this.router.navigate([""]) this.router.navigate([""])
} }
} }
}) })
} }
ngOnInit() {
} }
get displayName() { get displayName() {

17
src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.ts
View File

@@ -1,4 +1,4 @@
import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { Component, EventEmitter, Input, Output } from '@angular/core';
import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
import { Subject } from 'rxjs'; import { Subject } from 'rxjs';
@@ -7,7 +7,7 @@ import { Subject } from 'rxjs';
templateUrl: './confirm-dialog.component.html', templateUrl: './confirm-dialog.component.html',
styleUrls: ['./confirm-dialog.component.scss'] styleUrls: ['./confirm-dialog.component.scss']
}) })
export class ConfirmDialogComponent implements OnInit { export class ConfirmDialogComponent {
constructor(public activeModal: NgbActiveModal) { } constructor(public activeModal: NgbActiveModal) { }
@@ -35,7 +35,7 @@ export class ConfirmDialogComponent implements OnInit {
confirmButtonEnabled = true confirmButtonEnabled = true
seconds = 0 seconds = 0
subject: Subject<boolean> confirmSubject: Subject<boolean>
delayConfirm(seconds: number) { delayConfirm(seconds: number) {
this.confirmButtonEnabled = false this.confirmButtonEnabled = false
@@ -49,18 +49,15 @@ export class ConfirmDialogComponent implements OnInit {
}, 1000) }, 1000)
} }
ngOnInit(): void {
}
cancel() { cancel() {
this.subject?.next(false) this.confirmSubject?.next(false)
this.subject?.complete() this.confirmSubject?.complete()
this.activeModal.close() this.activeModal.close()
} }
confirm() { confirm() {
this.confirmClicked.emit() this.confirmClicked.emit()
this.subject?.next(true) this.confirmSubject?.next(true)
this.subject?.complete() this.confirmSubject?.complete()
} }
} }