From d70546472ac72f8768ab3cd8aae9631043d28183 Mon Sep 17 00:00:00 2001
From: Aya Morisawa <AyaMorisawa4869@gmail.com>
Date: Tue, 22 Sep 2015 18:13:35 +0900
Subject: [PATCH] Not use es6-promise in kefir.d.ts

---
 kefir/kefir-tests.ts | 4 ++--
 kefir/kefir.d.ts     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/kefir/kefir-tests.ts b/kefir/kefir-tests.ts
index c423a3dfe3..a0d0a96186 100644
--- a/kefir/kefir-tests.ts
+++ b/kefir/kefir-tests.ts
@@ -48,7 +48,7 @@ import { Observable, ObservablePool, Stream, Property, Event, Emitter } from 'ke
 {
 	let property01: Property<number, void> = Kefir.constant(1);
 	let property02: Property<void, number> = Kefir.constantError(1);
-	let property03: Property<number, void> = Kefir.fromPromise<number, void>(new Promise<number>(fulfill => fulfill(1)));
+	//let property03: Property<number, void> = Kefir.fromPromise<number, void>(new Promise<number>(fulfill => fulfill(1)));
 }
 
 // Convert observables
@@ -69,7 +69,7 @@ import { Observable, ObservablePool, Stream, Property, Event, Emitter } from 'ke
 	Kefir.sequentially(1000, [1, 2]).offAny(event => console.log('event:', event));
 	Kefir.sequentially(1000, [1, 2]).log('my stream');
 	Kefir.sequentially(1000, [1, 2]).offLog('my stream');
-	Kefir.sequentially(1000, [1, 2]).toPromise().then(x => console.log('fulfilled with:', x));
+	Kefir.sequentially(1000, [1, 2]).toPromise().then((x: number) => console.log('fulfilled with:', x));
 }
 
 // Modify an observable
diff --git a/kefir/kefir.d.ts b/kefir/kefir.d.ts
index 6a9544a7ca..9e3303f01e 100644
--- a/kefir/kefir.d.ts
+++ b/kefir/kefir.d.ts
@@ -4,9 +4,9 @@
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 /// <reference path="../node/node.d.ts" />
-/// <reference path="../es6-promise/es6-promise.d.ts" />
 
 declare module "kefir" {
+	
 	export interface Observable<T, S> {
 		// Subscribe / add side effects
 		onValue(callback: (value: T) => void): void;
@@ -19,7 +19,7 @@ declare module "kefir" {
 		offAny(callback: (event: Event<T | S>) => void): void;
 		log(name?: string): void;
 		offLog(name?: string): void;
-		toPromise(PromiseConstructor?: typeof Promise): Promise<T>;
+		toPromise(PromiseConstructor?: any): any;
 	}
 	
 	export interface Stream<T, S> extends Observable<T, S> {
@@ -163,7 +163,7 @@ declare module "kefir" {
 	// Create a property
 	export function constant<T>(value: T): Property<T, void>;
 	export function constantError<T>(error: T): Property<void, T>;
-	export function fromPromise<T, S>(promise: Promise<T>): Property<T, S>;
+	export function fromPromise<T, S>(promise: any): Property<T, S>;
 	
 	// Combine observables
 	export function combine<T, S, U>(obss: Observable<T, S>[], passiveObss: Observable<T, S>[], combinator?: (...values: T[]) => U): Observable<U, S>;