From 8a99d12d6ff517324142e422c7b553f66b9c290a Mon Sep 17 00:00:00 2001 From: Alex Eagle Date: Sun, 31 Jan 2016 14:30:52 -0800 Subject: [PATCH] fix(typings): don't expose PromiseConstructor dependency Fixes #1270 --- src/CoreOperators.ts | 2 +- src/Observable.ts | 4 ++-- src/operator/toPromise.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/CoreOperators.ts b/src/CoreOperators.ts index 5044b5b84c..aa5c92740c 100644 --- a/src/CoreOperators.ts +++ b/src/CoreOperators.ts @@ -84,7 +84,7 @@ export interface CoreOperators { timeout?: (due: number | Date, errorToSend?: any, scheduler?: Scheduler) => Observable; timeoutWith?: (due: number | Date, withObservable: Observable, scheduler?: Scheduler) => Observable | Observable; toArray?: () => Observable; - toPromise?: (PromiseCtor: PromiseConstructor) => Promise; + toPromise?: (PromiseCtor: typeof Promise) => Promise; window?: (closingNotifier: Observable) => Observable>; windowCount?: (windowSize: number, startWindowEvery: number) => Observable>; windowTime?: (windowTimeSpan: number, windowCreationInterval?: number, scheduler?: Scheduler) => Observable>; diff --git a/src/Observable.ts b/src/Observable.ts index d7220b2bc2..f17fed4349 100644 --- a/src/Observable.ts +++ b/src/Observable.ts @@ -129,7 +129,7 @@ export class Observable implements CoreOperators { * @returns {Promise} a promise that either resolves on observable completion or * rejects with the handled error */ - forEach(next: (value: T) => void, thisArg: any, PromiseCtor?: PromiseConstructor): Promise { + forEach(next: (value: T) => void, thisArg: any, PromiseCtor?: typeof Promise): Promise { if (!PromiseCtor) { if (root.Rx && root.Rx.config && root.Rx.config.Promise) { PromiseCtor = root.Rx.config.Promise; @@ -269,7 +269,7 @@ export class Observable implements CoreOperators { timeout: (due: number | Date, errorToSend?: any, scheduler?: Scheduler) => Observable; timeoutWith: (due: number | Date, withObservable: Observable, scheduler?: Scheduler) => Observable | Observable; toArray: () => Observable; - toPromise: (PromiseCtor?: PromiseConstructor) => Promise; + toPromise: (PromiseCtor?: typeof Promise) => Promise; window: (closingNotifier: Observable) => Observable>; windowCount: (windowSize: number, startWindowEvery: number) => Observable>; windowTime: (windowTimeSpan: number, windowCreationInterval?: number, scheduler?: Scheduler) => Observable>; diff --git a/src/operator/toPromise.ts b/src/operator/toPromise.ts index dd8c4dc60f..66196ebe4a 100644 --- a/src/operator/toPromise.ts +++ b/src/operator/toPromise.ts @@ -1,6 +1,6 @@ import {root} from '../util/root'; -export function toPromise(PromiseCtor?: PromiseConstructor): Promise { +export function toPromise(PromiseCtor?: typeof Promise): Promise { if (!PromiseCtor) { if (root.Rx && root.Rx.config && root.Rx.config.Promise) { PromiseCtor = root.Rx.config.Promise;