diff --git a/declarations.d.ts b/declarations.d.ts
index 1950fe37f..88412183b 100644
--- a/declarations.d.ts
+++ b/declarations.d.ts
@@ -79,153 +79,3 @@ declare module module {
}
// Same as module.exports
declare var exports: any;
-
-// Type definitions for es6-promise
-// Project: https://github.com/jakearchibald/ES6-Promise
-// Definitions by: François de Campredon
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
-interface Thenable {
- then(onFulfilled?: (value: R) => Thenable, onRejected?: (error: any) => Thenable): Thenable;
- then(onFulfilled?: (value: R) => Thenable, onRejected?: (error: any) => U): Thenable;
- then(onFulfilled?: (value: R) => Thenable, onRejected?: (error: any) => void): Thenable;
- then(onFulfilled?: (value: R) => U, onRejected?: (error: any) => Thenable): Thenable;
- then(onFulfilled?: (value: R) => U, onRejected?: (error: any) => U): Thenable;
- then(onFulfilled?: (value: R) => U, onRejected?: (error: any) => void): Thenable;
-}
-
-declare class Promise implements Thenable {
- /**
- * If you call resolve in the body of the callback passed to the constructor,
- * your promise is fulfilled with result object passed to resolve.
- * If you call reject your promise is rejected with the object passed to resolve.
- * For consistency and debugging (eg stack traces), obj should be an instanceof Error.
- * Any errors thrown in the constructor callback will be implicitly passed to reject().
- */
- constructor(callback: (resolve: (result?: R) => void, reject: (error: any) => void) => void);
- /**
- * If you call resolve in the body of the callback passed to the constructor,
- * your promise will be fulfilled/rejected with the outcome of thenable passed to resolve.
- * If you call reject your promise is rejected with the object passed to resolve.
- * For consistency and debugging (eg stack traces), obj should be an instanceof Error.
- * Any errors thrown in the constructor callback will be implicitly passed to reject().
- */
- constructor(callback: (resolve: (thenable?: Thenable) => void, reject: (error: any) => void) => void);
-
- /**
- * onFulfilled is called when/if "promise" resolves. onRejected is called when/if "promise" rejects.
- * Both are optional, if either/both are omitted the next onFulfilled/onRejected in the chain is called.
- * Both callbacks have a single parameter , the fulfillment value or rejection reason.
- * "then" returns a new promise equivalent to the value you return from onFulfilled/onRejected after being passed through Promise.resolve.
- * If an error is thrown in the callback, the returned promise rejects with that error.
- * @param onFulfilled called when/if "promise" resolves
- * @param onRejected called when/if "promise" rejects
- */
- then(onFulfilled?: (value: R) => Thenable, onRejected?: (error: any) => Thenable): Promise;
- /**
- * onFulfilled is called when/if "promise" resolves. onRejected is called when/if "promise" rejects.
- * Both are optional, if either/both are omitted the next onFulfilled/onRejected in the chain is called.
- * Both callbacks have a single parameter , the fulfillment value or rejection reason.
- * "then" returns a new promise equivalent to the value you return from onFulfilled/onRejected after being passed through Promise.resolve.
- * If an error is thrown in the callback, the returned promise rejects with that error.
- * @param onFulfilled called when/if "promise" resolves
- * @param onRejected called when/if "promise" rejects
- */
- then(onFulfilled?: (value: R) => Thenable, onRejected?: (error: any) => U): Promise;
- /**
- * onFulfilled is called when/if "promise" resolves. onRejected is called when/if "promise" rejects.
- * Both are optional, if either/both are omitted the next onFulfilled/onRejected in the chain is called.
- * Both callbacks have a single parameter , the fulfillment value or rejection reason.
- * "then" returns a new promise equivalent to the value you return from onFulfilled/onRejected after being passed through Promise.resolve.
- * If an error is thrown in the callback, the returned promise rejects with that error.
- * @param onFulfilled called when/if "promise" resolves
- * @param onRejected called when/if "promise" rejects
- */
- then(onFulfilled?: (value: R) => Thenable, onRejected?: (error: any) => void): Promise;
- /**
- * onFulfilled is called when/if "promise" resolves. onRejected is called when/if "promise" rejects.
- * Both are optional, if either/both are omitted the next onFulfilled/onRejected in the chain is called.
- * Both callbacks have a single parameter , the fulfillment value or rejection reason.
- * "then" returns a new promise equivalent to the value you return from onFulfilled/onRejected after being passed through Promise.resolve.
- * If an error is thrown in the callback, the returned promise rejects with that error.
- * @param onFulfilled called when/if "promise" resolves
- * @param onRejected called when/if "promise" rejects
- */
- then(onFulfilled?: (value: R) => U, onRejected?: (error: any) => Thenable): Promise;
- /**
- * onFulfilled is called when/if "promise" resolves. onRejected is called when/if "promise" rejects.
- * Both are optional, if either/both are omitted the next onFulfilled/onRejected in the chain is called.
- * Both callbacks have a single parameter , the fulfillment value or rejection reason.
- * "then" returns a new promise equivalent to the value you return from onFulfilled/onRejected after being passed through Promise.resolve.
- * If an error is thrown in the callback, the returned promise rejects with that error.
- * @param onFulfilled called when/if "promise" resolves
- * @param onRejected called when/if "promise" rejects
- */
- then(onFulfilled?: (value: R) => U, onRejected?: (error: any) => U): Promise;
- /**
- * onFulfilled is called when/if "promise" resolves. onRejected is called when/if "promise" rejects.
- * Both are optional, if either/both are omitted the next onFulfilled/onRejected in the chain is called.
- * Both callbacks have a single parameter , the fulfillment value or rejection reason.
- * "then" returns a new promise equivalent to the value you return from onFulfilled/onRejected after being passed through Promise.resolve.
- * If an error is thrown in the callback, the returned promise rejects with that error.
- * @param onFulfilled called when/if "promise" resolves
- * @param onRejected called when/if "promise" rejects
- */
- then(onFulfilled?: (value: R) => U, onRejected?: (error: any) => void): Promise;
-
- /**
- * Sugar for promise.then(undefined, onRejected)
- * @param onRejected called when/if "promise" rejects
- */
- catch(onRejected?: (error: any) => Thenable): Promise;
- /**
- * Sugar for promise.then(undefined, onRejected)
- * @param onRejected called when/if "promise" rejects
- */
- catch(onRejected?: (error: any) => U): Promise;
- /**
- * Sugar for promise.then(undefined, onRejected)
- * @param onRejected called when/if "promise" rejects
- */
- catch(onRejected?: (error: any) => void): Promise;
-}
-
-declare module Promise {
- /**
- * Returns promise (only if promise.constructor == Promise)
- */
- function cast(promise: Promise): Promise;
- /**
- * Make a promise that fulfills to obj.
- */
- function cast(object: R): Promise;
-
- /**
- * Make a new promise from the thenable.
- * A thenable is promise-like in as far as it has a "then" method.
- * This also creates a new promise if you pass it a genuine JavaScript promise, making it less efficient for casting than Promise.cast.
- */
- function resolve(thenable?: Thenable): Promise;
- /**
- * Make a promise that fulfills to obj. Same as Promise.cast(obj) in this situation.
- */
- function resolve(object?: R): Promise;
-
- /**
- * Make a promise that rejects to obj. For consistency and debugging (eg stack traces), obj should be an instanceof Error
- */
- function reject(error: any): Promise;
-
- /**
- * Make a promise that fulfills when every item in the array fulfills, and rejects if (and when) any item rejects.
- * the array passed to all can be a mixture of promise-like objects and other objects.
- * The fulfillment value is an array (in order) of fulfillment values. The rejection value is the first rejection value.
- */
- function all(promises: Promise[]): Promise;
-
- /**
- * Make a Promise that fulfills when any item fulfills, and rejects if any item rejects.
- */
- function race(promises: Promise[]): Promise;
-}
-
-declare function alert(message: string): Promise;
\ No newline at end of file
diff --git a/es-collections.d.ts b/es-collections.d.ts
new file mode 100644
index 000000000..ee8196f66
--- /dev/null
+++ b/es-collections.d.ts
@@ -0,0 +1,43 @@
+/* tslint:disable */
+/////////////////////////////
+/// IE11 ECMAScript Extensions
+/////////////////////////////
+
+interface List extends Array {}
+
+interface Map {
+ clear(): void;
+ delete(key: K): boolean;
+ forEach(callbackfn: (value: V, index: K, map: Map) => void, thisArg?: any): void;
+ get(key: K): V;
+ has(key: K): boolean;
+ set(key: K, value: V): Map;
+ size: number;
+}
+declare var Map: {
+ new (): Map;
+
+ // needed by Angular
+ // alexeagle: PATCHED
+ new(m: Map): Map;
+ new(l: List): Map;
+ prototype: Map;
+}
+
+interface Set {
+ add(value: T): Set;
+ clear(): void;
+ delete(value: T): boolean;
+ forEach(callbackfn: (value: T, index: T, set: Set) => void, thisArg?: any): void;
+ has(value: T): boolean;
+ size: number;
+}
+declare var Set: {
+ new (): Set;
+
+ // needed by Angular
+ // alexeagle PATCHED
+ new(s: Set): Set;
+ new(l: List): Set;
+ prototype: Set;
+}
diff --git a/es6-promise.d.ts b/es6-promise.d.ts
new file mode 100644
index 000000000..b8f93387b
--- /dev/null
+++ b/es6-promise.d.ts
@@ -0,0 +1,148 @@
+/* tslint:disable */
+// Type definitions for es6-promise
+// Project: https://github.com/jakearchibald/ES6-Promise
+// Definitions by: François de Campredon
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+interface Thenable {
+ then(onFulfilled?: (value: R) => Thenable, onRejected?: (error: any) => Thenable): Thenable;
+ then(onFulfilled?: (value: R) => Thenable, onRejected?: (error: any) => U): Thenable;
+ then(onFulfilled?: (value: R) => Thenable, onRejected?: (error: any) => void): Thenable;
+ then(onFulfilled?: (value: R) => U, onRejected?: (error: any) => Thenable): Thenable;
+ then(onFulfilled?: (value: R) => U, onRejected?: (error: any) => U): Thenable;
+ then(onFulfilled?: (value: R) => U, onRejected?: (error: any) => void): Thenable;
+}
+
+declare class Promise implements Thenable {
+ /**
+ * If you call resolve in the body of the callback passed to the constructor,
+ * your promise is fulfilled with result object passed to resolve.
+ * If you call reject your promise is rejected with the object passed to resolve.
+ * For consistency and debugging (eg stack traces), obj should be an instanceof Error.
+ * Any errors thrown in the constructor callback will be implicitly passed to reject().
+ */
+ constructor(callback: (resolve: (result?: R) => void, reject: (error: any) => void) => void);
+ /**
+ * If you call resolve in the body of the callback passed to the constructor,
+ * your promise will be fulfilled/rejected with the outcome of thenable passed to resolve.
+ * If you call reject your promise is rejected with the object passed to resolve.
+ * For consistency and debugging (eg stack traces), obj should be an instanceof Error.
+ * Any errors thrown in the constructor callback will be implicitly passed to reject().
+ */
+ constructor(callback: (resolve: (thenable?: Thenable) => void, reject: (error: any) => void) => void);
+
+ /**
+ * onFulfilled is called when/if "promise" resolves. onRejected is called when/if "promise" rejects.
+ * Both are optional, if either/both are omitted the next onFulfilled/onRejected in the chain is called.
+ * Both callbacks have a single parameter , the fulfillment value or rejection reason.
+ * "then" returns a new promise equivalent to the value you return from onFulfilled/onRejected after being passed through Promise.resolve.
+ * If an error is thrown in the callback, the returned promise rejects with that error.
+ * @param onFulfilled called when/if "promise" resolves
+ * @param onRejected called when/if "promise" rejects
+ */
+ then(onFulfilled?: (value: R) => Thenable, onRejected?: (error: any) => Thenable): Promise;
+ /**
+ * onFulfilled is called when/if "promise" resolves. onRejected is called when/if "promise" rejects.
+ * Both are optional, if either/both are omitted the next onFulfilled/onRejected in the chain is called.
+ * Both callbacks have a single parameter , the fulfillment value or rejection reason.
+ * "then" returns a new promise equivalent to the value you return from onFulfilled/onRejected after being passed through Promise.resolve.
+ * If an error is thrown in the callback, the returned promise rejects with that error.
+ * @param onFulfilled called when/if "promise" resolves
+ * @param onRejected called when/if "promise" rejects
+ */
+ then(onFulfilled?: (value: R) => Thenable, onRejected?: (error: any) => U): Promise;
+ /**
+ * onFulfilled is called when/if "promise" resolves. onRejected is called when/if "promise" rejects.
+ * Both are optional, if either/both are omitted the next onFulfilled/onRejected in the chain is called.
+ * Both callbacks have a single parameter , the fulfillment value or rejection reason.
+ * "then" returns a new promise equivalent to the value you return from onFulfilled/onRejected after being passed through Promise.resolve.
+ * If an error is thrown in the callback, the returned promise rejects with that error.
+ * @param onFulfilled called when/if "promise" resolves
+ * @param onRejected called when/if "promise" rejects
+ */
+ then(onFulfilled?: (value: R) => Thenable, onRejected?: (error: any) => void): Promise;
+ /**
+ * onFulfilled is called when/if "promise" resolves. onRejected is called when/if "promise" rejects.
+ * Both are optional, if either/both are omitted the next onFulfilled/onRejected in the chain is called.
+ * Both callbacks have a single parameter , the fulfillment value or rejection reason.
+ * "then" returns a new promise equivalent to the value you return from onFulfilled/onRejected after being passed through Promise.resolve.
+ * If an error is thrown in the callback, the returned promise rejects with that error.
+ * @param onFulfilled called when/if "promise" resolves
+ * @param onRejected called when/if "promise" rejects
+ */
+ then(onFulfilled?: (value: R) => U, onRejected?: (error: any) => Thenable): Promise;
+ /**
+ * onFulfilled is called when/if "promise" resolves. onRejected is called when/if "promise" rejects.
+ * Both are optional, if either/both are omitted the next onFulfilled/onRejected in the chain is called.
+ * Both callbacks have a single parameter , the fulfillment value or rejection reason.
+ * "then" returns a new promise equivalent to the value you return from onFulfilled/onRejected after being passed through Promise.resolve.
+ * If an error is thrown in the callback, the returned promise rejects with that error.
+ * @param onFulfilled called when/if "promise" resolves
+ * @param onRejected called when/if "promise" rejects
+ */
+ then(onFulfilled?: (value: R) => U, onRejected?: (error: any) => U): Promise;
+ /**
+ * onFulfilled is called when/if "promise" resolves. onRejected is called when/if "promise" rejects.
+ * Both are optional, if either/both are omitted the next onFulfilled/onRejected in the chain is called.
+ * Both callbacks have a single parameter , the fulfillment value or rejection reason.
+ * "then" returns a new promise equivalent to the value you return from onFulfilled/onRejected after being passed through Promise.resolve.
+ * If an error is thrown in the callback, the returned promise rejects with that error.
+ * @param onFulfilled called when/if "promise" resolves
+ * @param onRejected called when/if "promise" rejects
+ */
+ then(onFulfilled?: (value: R) => U, onRejected?: (error: any) => void): Promise;
+
+ /**
+ * Sugar for promise.then(undefined, onRejected)
+ * @param onRejected called when/if "promise" rejects
+ */
+ catch(onRejected?: (error: any) => Thenable): Promise;
+ /**
+ * Sugar for promise.then(undefined, onRejected)
+ * @param onRejected called when/if "promise" rejects
+ */
+ catch(onRejected?: (error: any) => U): Promise;
+ /**
+ * Sugar for promise.then(undefined, onRejected)
+ * @param onRejected called when/if "promise" rejects
+ */
+ catch(onRejected?: (error: any) => void): Promise;
+}
+
+declare module Promise {
+ /**
+ * Returns promise (only if promise.constructor == Promise)
+ */
+ function cast(promise: Promise): Promise;
+ /**
+ * Make a promise that fulfills to obj.
+ */
+ function cast(object: R): Promise;
+
+ /**
+ * Make a new promise from the thenable.
+ * A thenable is promise-like in as far as it has a "then" method.
+ * This also creates a new promise if you pass it a genuine JavaScript promise, making it less efficient for casting than Promise.cast.
+ */
+ function resolve(thenable?: Thenable): Promise;
+ /**
+ * Make a promise that fulfills to obj. Same as Promise.cast(obj) in this situation.
+ */
+ function resolve(object?: R): Promise;
+
+ /**
+ * Make a promise that rejects to obj. For consistency and debugging (eg stack traces), obj should be an instanceof Error
+ */
+ function reject(error: any): Promise;
+
+ /**
+ * Make a promise that fulfills when every item in the array fulfills, and rejects if (and when) any item rejects.
+ * the array passed to all can be a mixture of promise-like objects and other objects.
+ * The fulfillment value is an array (in order) of fulfillment values. The rejection value is the first rejection value.
+ */
+ function all(promises: Promise[]): Promise;
+
+ /**
+ * Make a Promise that fulfills when any item fulfills, and rejects if any item rejects.
+ */
+ function race(promises: Promise[]): Promise;
+}
diff --git a/libjs.d.ts b/libjs.d.ts
index a31a103a7..b716859b6 100644
--- a/libjs.d.ts
+++ b/libjs.d.ts
@@ -498,6 +498,11 @@ declare var Number: {
* JavaScript displays POSITIVE_INFINITY values as infinity.
*/
POSITIVE_INFINITY: number;
+
+ /**
+ * Checks if the passed value is an integer.
+ */
+ isInteger(value: any): boolean;
}
interface Math {
@@ -1756,23 +1761,6 @@ declare var DataView: {
new (buffer: ArrayBuffer, byteOffset?: number, length?: number): DataView;
}
-/////////////////////////////
-/// IE11 ECMAScript Extensions
-/////////////////////////////
-
-interface Map {
- clear(): void;
- delete(key: K): boolean;
- forEach(callbackfn: (value: V, index: K, map: Map) => void, thisArg?: any): void;
- get(key: K): V;
- has(key: K): boolean;
- set(key: K, value: V): Map;
- size: number;
-}
-declare var Map: {
- new (): Map;
-}
-
interface WeakMap {
clear(): void;
delete(key: K): boolean;
@@ -1784,15 +1772,4 @@ declare var WeakMap: {
new (): WeakMap;
}
-interface Set {
- add(value: T): Set;
- clear(): void;
- delete(value: T): boolean;
- forEach(callbackfn: (value: T, index: T, set: Set) => void, thisArg?: any): void;
- has(value: T): boolean;
- size: number;
-}
-declare var Set: {
- new (): Set;
-}
-
\ No newline at end of file
+declare function alert(message: string): Promise;
diff --git a/ui/frame/frame.ios.ts b/ui/frame/frame.ios.ts
index ed2fcc386..ee30705ca 100644
--- a/ui/frame/frame.ios.ts
+++ b/ui/frame/frame.ios.ts
@@ -151,7 +151,7 @@ export class Frame extends frameCommon.Frame {
}
}
-class UINavigationControllerImpl extends UINavigationController implements UINavigationControllerDelegate {
+export class UINavigationControllerImpl extends UINavigationController implements UINavigationControllerDelegate {
public static ObjCProtocols = [UINavigationControllerDelegate];
static new(): UINavigationControllerImpl {
@@ -240,7 +240,7 @@ class UINavigationControllerImpl extends UINavigationController implements UINav
}
/* tslint:disable */
-class iOSFrame implements definition.iOSFrame {
+export class iOSFrame implements definition.iOSFrame {
/* tslint:enable */
private _controller: UINavigationControllerImpl;
private _showNavigationBar: boolean;
diff --git a/ui/segmented-bar/segmented-bar.android.ts b/ui/segmented-bar/segmented-bar.android.ts
index bb4ac9fc5..71b648c7e 100644
--- a/ui/segmented-bar/segmented-bar.android.ts
+++ b/ui/segmented-bar/segmented-bar.android.ts
@@ -158,7 +158,7 @@ export class SegmentedBar extends common.SegmentedBar {
}
}
-class OurTabHost extends android.widget.TabHost {
+export class OurTabHost extends android.widget.TabHost {
constructor(context: any, attrs: any) {
super(context, attrs);
@@ -168,4 +168,4 @@ class OurTabHost extends android.widget.TabHost {
protected onAttachedToWindow(): void {
// overriden to remove the code that will steal the focus from edit fields.
}
-}
\ No newline at end of file
+}