From e6057412964979bebb5ca85665b2b39a37b0ccdb Mon Sep 17 00:00:00 2001 From: "Bogdan I. Bursuc" Date: Sun, 31 May 2015 10:30:59 +0300 Subject: [PATCH 1/8] ICurrent route can sometimes have a 5108route param --- angularjs/angular-route.d.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/angularjs/angular-route.d.ts b/angularjs/angular-route.d.ts index 4ddf87cab..3ac22c096 100644 --- a/angularjs/angular-route.d.ts +++ b/angularjs/angular-route.d.ts @@ -108,6 +108,8 @@ declare module angular.route { // see http://docs.angularjs.org/api/ng.$route#current interface ICurrentRoute extends IRoute { + $$route?: IRoute; + locals: { $scope: IScope; $template: string; From c32e1df7c5ed02a36a7e911db68440d3daf1e649 Mon Sep 17 00:00:00 2001 From: "Bogdan I. Bursuc" Date: Sun, 31 May 2015 10:32:28 +0300 Subject: [PATCH 2/8] IActionDescriptor can have a url override also --- angularjs/angular-resource.d.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/angularjs/angular-resource.d.ts b/angularjs/angular-resource.d.ts index 057cc1b56..ec8430cb8 100644 --- a/angularjs/angular-resource.d.ts +++ b/angularjs/angular-resource.d.ts @@ -45,6 +45,7 @@ declare module angular.resource { // Just a reference to facilitate describing new actions interface IActionDescriptor { + url?: string; method: string; isArray?: boolean; params?: any; From d9b2f58d6864a8a7e1792a54307a2d5c6dbec9ab Mon Sep 17 00:00:00 2001 From: "Bogdan I. Bursuc" Date: Mon, 1 Jun 2015 09:27:43 +0300 Subject: [PATCH 3/8] IResourceServiceProvider --- angularjs/angular-resource.d.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/angularjs/angular-resource.d.ts b/angularjs/angular-resource.d.ts index ec8430cb8..7f02a533e 100644 --- a/angularjs/angular-resource.d.ts +++ b/angularjs/angular-resource.d.ts @@ -21,6 +21,7 @@ declare module angular.resource { stripTrailingSlashes?: boolean; } + /////////////////////////////////////////////////////////////////////////// // ResourceService // see http://docs.angularjs.org/api/ngResource.$resource @@ -144,6 +145,13 @@ declare module angular.resource { ($resource: angular.resource.IResourceService): IResourceClass; >($resource: angular.resource.IResourceService): U; } + + // IResourceServiceProvider used to configure global settings + interface IResourceServiceProvider extends ng.IServiceProvider { + + defaults: IResourceOptions; + } + } /** extensions to base ng based on using angular-resource */ From adab66e6a9f99b9f55c33dd0e4a96fd065dafe0e Mon Sep 17 00:00:00 2001 From: "Bogdan I. Bursuc" Date: Mon, 1 Jun 2015 17:08:15 +0300 Subject: [PATCH 4/8] Remove incorrect ICurrentRoute api --- angularjs/angular-route.d.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/angularjs/angular-route.d.ts b/angularjs/angular-route.d.ts index 3ac22c096..4ddf87cab 100644 --- a/angularjs/angular-route.d.ts +++ b/angularjs/angular-route.d.ts @@ -108,8 +108,6 @@ declare module angular.route { // see http://docs.angularjs.org/api/ng.$route#current interface ICurrentRoute extends IRoute { - $$route?: IRoute; - locals: { $scope: IScope; $template: string; From e6360b8507bb68489c17e0a4eeee79276b955612 Mon Sep 17 00:00:00 2001 From: "Bogdan I. Bursuc" Date: Mon, 1 Jun 2015 17:08:46 +0300 Subject: [PATCH 5/8] Add IResourceServiceProvider interface --- angularjs/angular-resource-tests.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/angularjs/angular-resource-tests.ts b/angularjs/angular-resource-tests.ts index 148d40901..189eec3c5 100644 --- a/angularjs/angular-resource-tests.ts +++ b/angularjs/angular-resource-tests.ts @@ -135,4 +135,11 @@ mod = mod.factory('factory name', resourceServiceFactoryFunction); /////////////////////////////////////// // IResource -/////////////////////////////////////// \ No newline at end of file +/////////////////////////////////////// + + +/////////////////////////////////////// +// IResourceServiceProvider +/////////////////////////////////////// +var resourceServiceProvider: angular.resource.IResourceServiceProvider; +resourceServiceProvider.defaults.stripTrailingSlashes = false; From 64d5b5286f6c15426ce4d4e0e535b85ddfc33629 Mon Sep 17 00:00:00 2001 From: "Bogdan I. Bursuc" Date: Mon, 1 Jun 2015 17:14:39 +0300 Subject: [PATCH 6/8] AngularJS: IActionDescriptor test new url parameter --- angularjs/angular-resource-tests.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/angularjs/angular-resource-tests.ts b/angularjs/angular-resource-tests.ts index 189eec3c5..f7f248ea8 100644 --- a/angularjs/angular-resource-tests.ts +++ b/angularjs/angular-resource-tests.ts @@ -8,6 +8,7 @@ interface IMyResourceClass extends angular.resource.IResourceClass /////////////////////////////////////// var actionDescriptor: angular.resource.IActionDescriptor; +actionDescriptor.url = '/api/test-url/' actionDescriptor.headers = { header: 'value' }; actionDescriptor.isArray = true; actionDescriptor.method = 'method action'; From 0af334e2c9e088838c33ee3b09172c986fe8d54a Mon Sep 17 00:00:00 2001 From: "Bogdan I. Bursuc" Date: Mon, 1 Jun 2015 17:28:16 +0300 Subject: [PATCH 7/8] ICurrentRoute.locals will also contain any resolved values --- angularjs/angular-route.d.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/angularjs/angular-route.d.ts b/angularjs/angular-route.d.ts index 4ddf87cab..662b2c11d 100644 --- a/angularjs/angular-route.d.ts +++ b/angularjs/angular-route.d.ts @@ -109,6 +109,7 @@ declare module angular.route { // see http://docs.angularjs.org/api/ng.$route#current interface ICurrentRoute extends IRoute { locals: { + [index: string]: any; $scope: IScope; $template: string; }; From 2f4323724b8344f7ffa302340772e31355eaa220 Mon Sep 17 00:00:00 2001 From: "Bogdan I. Bursuc" Date: Tue, 9 Jun 2015 08:03:03 +0300 Subject: [PATCH 8/8] Tests for ICurrentRoute property --- angularjs/angular-route-tests.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/angularjs/angular-route-tests.ts b/angularjs/angular-route-tests.ts index 3607b6f13..0260359fb 100644 --- a/angularjs/angular-route-tests.ts +++ b/angularjs/angular-route-tests.ts @@ -34,3 +34,7 @@ $routeProvider }) .otherwise({ redirectTo: '/' }) .otherwise({ redirectTo: ($routeParams?: ng.route.IRouteParamsService, $locationPath?: string, $locationSearch?: any) => "" }); + + +var current: ng.route.ICurrentRoute; +current.locals['test-key'] = 'test-value';