Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

updates signature / documents for timeoutWith #1902

Merged
merged 2 commits into from Aug 31, 2016
Merged

updates signature / documents for timeoutWith #1902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c53a0dd
style(timeoutWith): update signature to accept ObservableInput
kwonoj Aug 24, 2016
4013116
docs(MIGRATION): add timeoutWith operator split
kwonoj Aug 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 9 additions & 0 deletions MIGRATION.md
View file
Open in desktop
Expand Up @@ -215,6 +215,15 @@ To reduce polymorphism and get better performance out of operators, some operato
<td><code>delay(subscriptionDelay?: Observable<any>, delayDurationSelector: function)</code></td>
<td><code>delayWhen(delayDurationSelector: function, subscriptionDelay?: Observable<any>)</code></td>
</tr>
<tr>
<td rowspan="2"><code>timeout</code></td>
<td><code>timeout(dueTime: number | Date, other?: Error, scheduler?: Scheduler)</code></td>
<td><code>timeout(due: number | Date, errorToSend?: any, scheduler?: Scheduler)</code></td>
</tr>
<tr>
<td><code>timeout(dueTime: number | Date, other?: Observable | Promise, scheduler?: Scheduler)</code></td>
<td><code>timeoutWith(due: number | Date, withObservable: ObservableInput, scheduler: Scheduler)</code></td>
</tr>
</tbody>
</table>

Expand Down
12 changes: 6 additions & 6 deletions src/operator/timeoutWith.ts
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@ import { Subscriber } from '../Subscriber';
import { Scheduler } from '../Scheduler';
import { async } from '../scheduler/async';
import { Subscription, TeardownLogic } from '../Subscription';
import { Observable } from '../Observable';
import { Observable, ObservableInput } from '../Observable';
import { isDate } from '../util/isDate';
import { OuterSubscriber } from '../OuterSubscriber';
import { subscribeToResult } from '../util/subscribeToResult';
Expand All @@ -17,22 +17,22 @@ import { subscribeToResult } from '../util/subscribeToResult';
* @owner Observable
*/
export function timeoutWith<T, R>(due: number | Date,
withObservable: Observable<R>,
withObservable: ObservableInput<R>,
scheduler: Scheduler = async): Observable<T | R> {
let absoluteTimeout = isDate(due);
let waitFor = absoluteTimeout ? (+due - scheduler.now()) : Math.abs(<number>due);
return this.lift(new TimeoutWithOperator(waitFor, absoluteTimeout, withObservable, scheduler));
}

export interface TimeoutWithSignature<T> {
(due: number | Date, withObservable: Observable<T>, scheduler?: Scheduler): Observable<T>;
<R>(due: number | Date, withObservable: Observable<R>, scheduler?: Scheduler): Observable<T | R>;
(due: number | Date, withObservable: ObservableInput<T>, scheduler?: Scheduler): Observable<T>;
<R>(due: number | Date, withObservable: ObservableInput<R>, scheduler?: Scheduler): Observable<T | R>;
}

class TimeoutWithOperator<T> implements Operator<T, T> {
constructor(private waitFor: number,
private absoluteTimeout: boolean,
private withObservable: Observable<any>,
private withObservable: ObservableInput<any>,
private scheduler: Scheduler) {
}

Expand Down Expand Up @@ -63,7 +63,7 @@ class TimeoutWithSubscriber<T, R> extends OuterSubscriber<T, R> {
constructor(public destination: Subscriber<T>,
private absoluteTimeout: boolean,
private waitFor: number,
private withObservable: Observable<any>,
private withObservable: ObservableInput<any>,
private scheduler: Scheduler) {
super();
destination.add(this);
Expand Down