iSharkFly-Docs
/
angular-docs-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(aio): preserve static Observable methods (#21351) 

PR Close #21351
This commit is contained in:
George Kalpakas 2018-01-10 14:04:41 +02:00 committed by Alex Eagle
parent 85013ad160
commit 137b9c784c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
aio/src/app/search/search.service.ts
View File

@ -7,9 +7,10 @@ can be found in the LICENSE file at http://angular.io/license
import { NgZone, Injectable } from '@angular/core'; import { NgZone, Injectable } from '@angular/core';
import { Observable } from 'rxjs/Observable'; import { Observable } from 'rxjs/Observable';
import { ReplaySubject } from 'rxjs/ReplaySubject'; import { ReplaySubject } from 'rxjs/ReplaySubject';
import 'rxjs/add/observable/race'; import { race } from 'rxjs/observable/race';
import 'rxjs/add/observable/timer'; import { timer } from 'rxjs/observable/timer';
import 'rxjs/add/operator/concatMap'; import 'rxjs/add/operator/concatMap';
import 'rxjs/add/operator/first';
import 'rxjs/add/operator/publishReplay'; import 'rxjs/add/operator/publishReplay';
import { WebWorkerClient } from 'app/shared/web-worker'; import { WebWorkerClient } from 'app/shared/web-worker';
import { SearchResults } from 'app/search/interfaces'; import { SearchResults } from 'app/search/interfaces';
@ -30,11 +31,10 @@ export class SearchService {
* @param initDelay the number of milliseconds to wait before we load the WebWorker and generate the search index * @param initDelay the number of milliseconds to wait before we load the WebWorker and generate the search index
*/ */
initWorker(workerUrl: string, initDelay: number) { initWorker(workerUrl: string, initDelay: number) {
const ready = this.ready = Observable
// Wait for the initDelay or the first search // Wait for the initDelay or the first search
.race<any>( const ready = this.ready = race<any>(
Observable.timer(initDelay), timer(initDelay),
(this.searchesSubject as Observable<string>).first() (this.searchesSubject.asObservable()).first()
) )
.concatMap(() => { .concatMap(() => {
// Create the worker and load the index // Create the worker and load the index