Merge pull request #964 from AlexanderLindsay/next

Fix definition of MithrilPromise
This commit is contained in:
Isiah Meadows 2016-03-03 20:13:51 -05:00
commit 1a473ee63e

4
mithril.d.ts vendored
View file

@ -658,7 +658,7 @@ declare module _mithril {
* *
* @see m.prop which returns objects that implement this interface. * @see m.prop which returns objects that implement this interface.
*/ */
interface MithrilPromiseProperty<T> extends MithrilPromise<T>, interface MithrilPromiseProperty<T> extends MithrilPromise<T | MithrilPromise<T>>,
MithrilProperty<MithrilPromise<T>> { MithrilProperty<MithrilPromise<T>> {
/** /**
* Gets the contained promise. * Gets the contained promise.
@ -747,7 +747,7 @@ declare module _mithril {
/** /**
* This represents a Mithril promise object. * This represents a Mithril promise object.
*/ */
interface MithrilPromise<T> extends Thennable<T>, MithrilProperty<MithrilPromise<T>> { interface MithrilPromise<T> extends Thennable<T>, MithrilProperty<T | MithrilPromise<T>> {
/** /**
* Chain this promise with a simple success callback, propogating * Chain this promise with a simple success callback, propogating
* rejections. * rejections.