mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-18 07:23:03 +00:00
Merge remote-tracking branch 'remotes/origin/master' into submission
# Conflicts: # package.json # src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts # src/app/+search-page/search-service/search.service.spec.ts # src/app/app.module.ts # src/app/core/auth/auth.interceptor.ts # src/app/core/cache/response-cache.service.spec.ts # src/app/core/data/browse-response-parsing.service.spec.ts # src/app/core/data/data.service.spec.ts # src/app/core/data/request.service.spec.ts # src/app/core/data/request.service.ts # src/app/core/dspace-rest-v2/dspace-rest-v2.service.ts # src/app/core/integration/integration.service.ts # src/app/core/metadata/metadata.service.spec.ts # src/app/core/registry/registry.service.spec.ts # src/app/core/shared/collection.model.ts # src/app/core/shared/item.model.ts # src/app/shared/form/builder/ds-dynamic-form-ui/models/dynamic-group/dynamic-group.component.spec.ts # src/app/shared/form/builder/ds-dynamic-form-ui/models/dynamic-group/dynamic-group.components.ts # src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts # src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts # src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts # src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts # src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.spec.ts # src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.ts # src/app/shared/form/builder/ds-dynamic-form-ui/models/typeahead/dynamic-typeahead.component.ts # src/app/shared/form/builder/form-builder.service.spec.ts # src/app/shared/form/form.service.spec.ts # src/app/shared/notifications/notification/notification.component.spec.ts # src/app/shared/services/route.service.spec.ts # src/app/shared/services/route.service.ts # src/app/shared/shared.module.ts # yarn.lock
This commit is contained in:
@@ -1,9 +1,8 @@
|
||||
import {distinctUntilChanged, debounceTime, takeUntil} from 'rxjs/operators';
|
||||
import { Directive, Input, Output, EventEmitter, OnDestroy, OnInit } from '@angular/core';
|
||||
import { NgControl } from '@angular/forms';
|
||||
import 'rxjs/add/operator/debounceTime';
|
||||
import 'rxjs/add/operator/distinctUntilChanged';
|
||||
import 'rxjs/add/operator/takeUntil';
|
||||
import { Subject } from 'rxjs/Subject';
|
||||
|
||||
import { Subject } from 'rxjs';
|
||||
|
||||
@Directive({
|
||||
selector: '[ngModel][dsDebounce]',
|
||||
@@ -44,10 +43,10 @@ export class DebounceDirective implements OnInit, OnDestroy {
|
||||
* Emit it when the debounceTime is over without new changes
|
||||
*/
|
||||
ngOnInit() {
|
||||
this.model.valueChanges
|
||||
.takeUntil(this.subject)
|
||||
.debounceTime(this.dsDebounce)
|
||||
.distinctUntilChanged()
|
||||
this.model.valueChanges.pipe(
|
||||
takeUntil(this.subject),
|
||||
debounceTime(this.dsDebounce),
|
||||
distinctUntilChanged(),)
|
||||
.subscribe((modelValue) => {
|
||||
if (this.isFirstChange) {
|
||||
this.isFirstChange = false;
|
||||
|
Reference in New Issue
Block a user