,
- private viewContainer: ViewContainerRef,
- private cd: ChangeDetectorRef) { }
+ private viewContainer: ViewContainerRef) { }
public ngOnInit() {
this.completer.registerList(this);
@@ -96,7 +98,7 @@ export class CtrListDirective implements OnInit, CompleterList {
if (this.clearTimer) {
this.clearTimer.unsubscribe();
}
- this.searchTimer = Observable.timer(this.ctrListPause).subscribe(() => {
+ this.searchTimer = timer(this.ctrListPause).subscribe(() => {
this.searchTimerComplete(term);
});
} else if (!isNil(term) && term.length < this.ctrListMinSearchLength) {
@@ -109,7 +111,7 @@ export class CtrListDirective implements OnInit, CompleterList {
if (this.searchTimer) {
this.searchTimer.unsubscribe();
}
- this.clearTimer = Observable.timer(CLEAR_TIMEOUT).subscribe(() => {
+ this.clearTimer = timer(CLEAR_TIMEOUT).subscribe(() => {
this._clear();
});
}
@@ -163,7 +165,7 @@ export class CtrListDirective implements OnInit, CompleterList {
this.viewRef!.context.searchInitialized = this.ctx.searchInitialized;
this.viewRef.detectChanges();
}
- this.cd.markForCheck();
+ this.ctrListCd.markForCheck();
}
private getBestMatchIndex() {
@@ -188,11 +190,11 @@ export class CtrListDirective implements OnInit, CompleterList {
private dataServiceSubscribe() {
if (this._dataService) {
this._dataService
- .catch(err => {
+ .pipe(catchError(err => {
console.error(err);
console.error('Unexpected error in dataService: errors should be handled by the dataService Observable');
- return [];
- })
+ return of([]);
+ }))
.subscribe(results => {
this.ctx.searchInitialized = true;
this.ctx.searching = false;
diff --git a/src/app/edge-completer/directives/ctr-row.directive.ts b/src/app/edge-completer/directives/ctr-row.directive.ts
index 6acdab9..fcf18cb 100644
--- a/src/app/edge-completer/directives/ctr-row.directive.ts
+++ b/src/app/edge-completer/directives/ctr-row.directive.ts
@@ -1,4 +1,4 @@
-import { Directive, ElementRef, Host, HostListener, Input, OnDestroy, Renderer } from '@angular/core';
+import {Directive, ElementRef, Host, HostListener, Input, OnDestroy, Renderer2} from '@angular/core';
import { CtrlDropdownDirective, CtrRowElement, CtrRowItem } from './ctr-dropdown.directive';
import { CompleterItem } from '../shared/completer-item';
@@ -11,7 +11,7 @@ export class CtrRowDirective implements CtrRowElement, OnDestroy {
private _rowIndex: number;
private _item: CompleterItem;
- constructor(private el: ElementRef, private renderer: Renderer, @Host() private dropdown: CtrlDropdownDirective) { }
+ constructor(private el: ElementRef, private renderer: Renderer2, @Host() private dropdown: CtrlDropdownDirective) { }
public ngOnDestroy() {
if (this._rowIndex) {
@@ -41,7 +41,10 @@ export class CtrRowDirective implements CtrRowElement, OnDestroy {
public setHighlighted(selected: boolean) {
this.selected = selected;
- this.renderer.setElementClass(this.el.nativeElement, 'completer-selected-row', this.selected);
+ if (this.selected)
+ this.renderer.addClass(this.el.nativeElement, 'completer-selected-row');
+ else
+ this.renderer.removeClass(this.el.nativeElement, 'completer-selected-row');
}
public getNativeElement() {
diff --git a/src/app/edge-completer/edge-completer.component.html b/src/app/edge-completer/edge-completer.component.html
index be7548a..591ef54 100644
--- a/src/app/edge-completer/edge-completer.component.html
+++ b/src/app/edge-completer/edge-completer.component.html
@@ -10,6 +10,7 @@
= 10, Chrome >= 55 (including Opera),
- * Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile.
- *
- * Learn more in https://angular.io/docs/ts/latest/guide/browser-support.html
- */
-
-/***************************************************************************************************
- * BROWSER POLYFILLS
- */
-
-/** IE9, IE10 and IE11 requires all of the following polyfills. **/
-// import 'core-js/es6/symbol';
-// import 'core-js/es6/object';
-// import 'core-js/es6/function';
-// import 'core-js/es6/parse-int';
-// import 'core-js/es6/parse-float';
-// import 'core-js/es6/number';
-// import 'core-js/es6/math';
-// import 'core-js/es6/string';
-// import 'core-js/es6/date';
-// import 'core-js/es6/array';
-// import 'core-js/es6/regexp';
-// import 'core-js/es6/map';
-// import 'core-js/es6/weak-map';
-// import 'core-js/es6/set';
-
-/** IE10 and IE11 requires the following for NgClass support on SVG elements */
-// import 'classlist.js'; // Run `npm install --save classlist.js`.
-
-/** IE10 and IE11 requires the following for the Reflect API. */
-// import 'core-js/es6/reflect';
-
-/** Evergreen browsers require these. **/
-// Used for reflect-metadata in JIT. If you use AOT (and only Angular decorators), you can remove.
-import 'core-js/es7/reflect';
/**
diff --git a/src/tsconfig.spec.json b/src/tsconfig.spec.json
index ac22a29..6e51cae 100644
--- a/src/tsconfig.spec.json
+++ b/src/tsconfig.spec.json
@@ -1,19 +1,20 @@
-{
- "extends": "../tsconfig.json",
- "compilerOptions": {
- "outDir": "../out-tsc/spec",
- "baseUrl": "./",
- "module": "commonjs",
- "types": [
- "jasmine",
- "node"
- ]
- },
- "files": [
- "test.ts"
- ],
- "include": [
- "**/*.spec.ts",
- "**/*.d.ts"
- ]
-}
+{
+ "extends": "../tsconfig.json",
+ "compilerOptions": {
+ "outDir": "../out-tsc/spec",
+ "baseUrl": "./",
+ "module": "commonjs",
+ "types": [
+ "jasmine",
+ "node"
+ ]
+ },
+ "files": [
+ "test.ts",
"polyfills.ts"
+
+ ],
+ "include": [
+ "**/*.spec.ts",
+ "**/*.d.ts"
+ ]
+}
diff --git a/tsconfig.json b/tsconfig.json
index a6c016b..8cd9a30 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,6 +1,7 @@
{
"compileOnSave": false,
"compilerOptions": {
+ "importHelpers": true,
"outDir": "./dist/out-tsc",
"sourceMap": true,
"declaration": false,
@@ -14,6 +15,8 @@
"lib": [
"es2017",
"dom"
- ]
+ ],
+ "module": "es2015",
+ "baseUrl": "./"
}
-}
+}
\ No newline at end of file
diff --git a/tslint.json b/tslint.json
index c6715a6..1d05771 100644
--- a/tslint.json
+++ b/tslint.json
@@ -18,7 +18,6 @@
"forin": true,
"import-blacklist": [
true,
- "rxjs",
"rxjs/Rx"
],
"import-spacing": true,
