Merge remote-tracking branch 'origin/master' into types-merge-20161122

This commit is contained in:
Nathan Shively-Sanders
2016-11-22 15:08:50 -08:00
21 changed files with 2620 additions and 970 deletions

View File

@@ -162,6 +162,8 @@ declare module 'angular' {
* Really just a regular Array object with $promise and $resolve attached to it
*/
interface IResourceArray<T> extends Array<T & IResource<T>> {
$cancelRequest(): void;
/** the promise of the original server interaction that created this collection. **/
$promise: angular.IPromise<IResourceArray<T>>;
$resolved: boolean;