Merge branch 'borisyankov-definitelytyped-master' into updating-angular-resource

Conflicts:
	angularjs/angular-resource-tests.ts
This commit is contained in:
John Emau
2013-11-11 12:52:38 -08:00
92 changed files with 23920 additions and 4564 deletions
+5 -5
View File
@@ -1,4 +1,4 @@
// Type definitions for Angular JS 1.0 (ngResource module)
// Type definitions for Angular JS 1.2 (ngResource module)
// Project: http://angularjs.org
// Definitions by: Diego Vilar <http://github.com/diegovilar>
// Definitions: https://github.com/borisyankov/DefinitelyTyped
@@ -19,10 +19,10 @@ declare module ng.resource {
// that deeply.
///////////////////////////////////////////////////////////////////////////
interface IResourceService {
(url: string, paramDefaults?: any,
/** example: {update: { method: 'PUT' }, delete: deleteDescriptor }
where deleteDescriptor : IActionDescriptor */
actionDescriptors?: any): IResourceClass;
(url: string, paramDefaults?: any,
/** example: {update: { method: 'PUT' }, delete: deleteDescriptor }
where deleteDescriptor : IActionDescriptor */
actionDescriptors?: any): IResourceClass;
}
// Just a reference to facilitate describing new actions