From a396155280971964acbcea38d10a6e0ce837e131 Mon Sep 17 00:00:00 2001
From: Igor Oleinikov <igor@oleinikov.ru>
Date: Wed, 19 Mar 2014 17:14:07 +0400
Subject: [PATCH] Extracted common part of defintitions of rx.time.d.ts and
 rx.lite.d.ts into rx.time-lite.ts.

---
 rx.js/rx.time-lite.ts | 51 +++++++++++++++++++++++++++++++++++++++++++
 rx.js/rx.time.d.ts    | 41 +---------------------------------
 2 files changed, 52 insertions(+), 40 deletions(-)
 create mode 100644 rx.js/rx.time-lite.ts

diff --git a/rx.js/rx.time-lite.ts b/rx.js/rx.time-lite.ts
new file mode 100644
index 000000000..1082f1a7b
--- /dev/null
+++ b/rx.js/rx.time-lite.ts
@@ -0,0 +1,51 @@
+// This file contains common part of defintions for rx.time.d.ts and rx.lite.d.ts
+// Do not include the file separately.
+
+///<reference path="rx-lite.ts" />
+
+declare module Rx {
+	export interface TimeInterval<T> {
+		value: T;
+		interval: number;
+	}
+
+	export interface Timestamp<T> {
+		value: T;
+		timestamp: number;
+	}
+
+	export interface Observable<T> {
+		delay(dueTime: number, scheduler?: IScheduler): Observable<T>;
+		throttle(dueTime: number, scheduler?: IScheduler): Observable<T>;
+		timeInterval(scheduler?: IScheduler): Observable<TimeInterval<T>>;
+		timestamp(scheduler?: IScheduler): Observable<Timestamp<T>>;
+		sample(interval: number, scheduler?: IScheduler): Observable<T>;
+		sample<TSample>(sampler: Observable<TSample>, scheduler?: IScheduler): Observable<T>;
+		timeout(dueTime: Date, other?: Observable<T>, scheduler?: IScheduler): Observable<T>;
+		timeout(dueTime: number, other?: Observable<T>, scheduler?: IScheduler): Observable<T>;
+
+		delaySubscription(dueTime: number, scheduler?: IScheduler): Observable<T>;
+		delayWithSelector(delayDurationSelector: (item: T) => number): Observable<T>;
+		delayWithSelector(subscriptionDelay: number, delayDurationSelector: (item: T) => number): Observable<T>;
+
+		timeoutWithSelector<TTimeout>(firstTimeout: Observable<TTimeout>, timeoutdurationSelector?: (item: T) => Observable<TTimeout>, other?: Observable<T>): Observable<T>;
+		throttleWithSelector<TTimeout>(throttleDurationSelector: (item: T) => Observable<TTimeout>): Observable<T>;
+
+		skipLastWithTime(duration: number, scheduler?: IScheduler): Observable<T>;
+		takeLastWithTime(duration: number, timerScheduler?: IScheduler, loopScheduler?: IScheduler): Observable<T>;
+
+		takeLastBufferWithTime(duration: number, scheduler?: IScheduler): Observable<T[]>;
+		takeWithTime(duration: number, scheduler?: IScheduler): Observable<T>;
+		skipWithTime(duration: number, scheduler?: IScheduler): Observable<T>;
+
+		skipUntilWithTime(startTime: Date, scheduler?: IScheduler): Observable<T>;
+		takeUntilWithTime(endTime: Date, scheduler?: IScheduler): Observable<T>;
+	}
+
+	interface ObservableStatic {
+		interval(period: number, scheduler?: IScheduler): Observable<number>;
+		interval(dutTime: number, period: number, scheduler?: IScheduler): Observable<number>;
+		timer(dueTime: number, period: number, scheduler: IScheduler): Observable<number>;
+		timer(dueTime: number, scheduler: IScheduler): Observable<number>;
+	}
+}
diff --git a/rx.js/rx.time.d.ts b/rx.js/rx.time.d.ts
index 7e08c7949..994d9bf46 100644
--- a/rx.js/rx.time.d.ts
+++ b/rx.js/rx.time.d.ts
@@ -5,60 +5,21 @@
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 ///<reference path="rx.d.ts" />
+///<reference path="rx.time-lite.ts" />
 
 declare module Rx {
-
-	export interface TimeInterval<T> {
-		value: T;
-		interval: number;
-	}
-
-	export interface Timestamp<T> {
-		value: T;
-		timestamp: number;
-	}
-
 	export interface Observable<T> {
-		delay(dueTime: number, scheduler?: IScheduler): Observable<T>;
-		throttle(dueTime: number, scheduler?: IScheduler): Observable<T>;
 		windowWithTime(timeSpan: number, timeShift: number, scheduler?: IScheduler): Observable<Observable<T>>;
 		windowWithTime(timeSpan: number, scheduler?: IScheduler): Observable<Observable<T>>;
 		windowWithTimeOrCount(timeSpan: number, count: number, scheduler?: IScheduler): Observable<Observable<T>>;
 		bufferWithTime(timeSpan: number, timeShift: number, scheduler?: IScheduler): Observable<T[]>;
 		bufferWithTime(timeSpan: number, scheduler?: IScheduler): Observable<T[]>;
 		bufferWithTimeOrCount(timeSpan: number, count: number, scheduler?: IScheduler): Observable<T[]>;
-		timeInterval(scheduler?: IScheduler): Observable<TimeInterval<T>>;
-		timestamp(scheduler?: IScheduler): Observable<Timestamp<T>>;
-		sample(interval: number, scheduler?: IScheduler): Observable<T>;
-		sample<TSample>(sampler: Observable<TSample>, scheduler?: IScheduler): Observable<T>;
-		timeout(dueTime: Date, other?: Observable<T>, scheduler?: IScheduler): Observable<T>;
-		timeout(dueTime: number, other?: Observable<T>, scheduler?: IScheduler): Observable<T>;
-
-		delaySubscription(dueTime: number, scheduler?: IScheduler): Observable<T>;
-		delayWithSelector(delayDurationSelector: (item: T) => number): Observable<T>;
-		delayWithSelector(subscriptionDelay: number, delayDurationSelector: (item: T) => number): Observable<T>;
-
-		timeoutWithSelector<TTimeout>(firstTimeout: Observable<TTimeout>, timeoutdurationSelector?: (item: T) => Observable<TTimeout>, other?: Observable<T>): Observable<T>;
-		throttleWithSelector<TTimeout>(throttleDurationSelector: (item: T) => Observable<TTimeout>): Observable<T>;
-
-		skipLastWithTime(duration: number, scheduler?: IScheduler): Observable<T>;
-		takeLastWithTime(duration: number, timerScheduler?: IScheduler, loopScheduler?: IScheduler): Observable<T>;
-
-		takeLastBufferWithTime(duration: number, scheduler?: IScheduler): Observable<T[]>;
-		takeWithTime(duration: number, scheduler?: IScheduler): Observable<T>;
-		skipWithTime(duration: number, scheduler?: IScheduler): Observable<T>;
-
-		skipUntilWithTime(startTime: Date, scheduler?: IScheduler): Observable<T>;
-		takeUntilWithTime(endTime: Date, scheduler?: IScheduler): Observable<T>;
 	}
 
 	interface ObservableStatic {
-		interval(period: number, scheduler?: IScheduler): Observable<number>;
-		interval(dutTime: number, period: number, scheduler?: IScheduler): Observable<number>;
 		timer(dueTime: Date, period: number, scheduler: IScheduler): Observable<number>;
 		timer(dueTime: Date, scheduler: IScheduler): Observable<number>;
-		timer(dueTime: number, period: number, scheduler: IScheduler): Observable<number>;
-		timer(dueTime: number, scheduler: IScheduler): Observable<number>;
 
 		generateWithAbsoluteTime<TState, TResult>(
 			initialState: TState,