From 6a7dd893937af193d609f56cc2437d7838f0d154 Mon Sep 17 00:00:00 2001 From: mick delaney Date: Mon, 29 Jun 2015 14:43:57 +0100 Subject: [PATCH 1/4] Adding angular-rx --- angular-rx/rx.angular-tests.ts | 16 ++++++++++++++++ angular-rx/rx.angular.d.ts | 0 2 files changed, 16 insertions(+) create mode 100644 angular-rx/rx.angular-tests.ts create mode 100644 angular-rx/rx.angular.d.ts diff --git a/angular-rx/rx.angular-tests.ts b/angular-rx/rx.angular-tests.ts new file mode 100644 index 000000000..f01d8e629 --- /dev/null +++ b/angular-rx/rx.angular-tests.ts @@ -0,0 +1,16 @@ +/// + +var app = angular.module('testModule'); + +interface AppScope extends rx.angular.IRxScope { +} + +app.controller('Ctrl', ($scope: AppScope) => { + + this.inputObservable = $scope.$toObservable('term') + .throttle(400) + .safeApply($scope, (results: any) => { + this.results = results; + }); + +}); diff --git a/angular-rx/rx.angular.d.ts b/angular-rx/rx.angular.d.ts new file mode 100644 index 000000000..e69de29bb From fbe275ecb869091340e7c03adda1082a28cfe5d2 Mon Sep 17 00:00:00 2001 From: mick delaney Date: Mon, 29 Jun 2015 14:44:12 +0100 Subject: [PATCH 2/4] Adding angular-rx --- angular-rx/rx.angular.d.ts | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/angular-rx/rx.angular.d.ts b/angular-rx/rx.angular.d.ts index e69de29bb..f32933f6d 100644 --- a/angular-rx/rx.angular.d.ts +++ b/angular-rx/rx.angular.d.ts @@ -0,0 +1,18 @@ +/// +/// +/// + +declare module Rx { + + interface IObservable { + safeApply($scope: ng.IScope, callback: (data: any) => void); + } +} + +declare module rx.angular { + + export interface IRxScope extends ng.IScope { + $toObservable(property: string): Rx.Observable; + } +} + From 3623794ae9233b33a2d48f670226d0d99d74860e Mon Sep 17 00:00:00 2001 From: mick delaney Date: Wed, 1 Jul 2015 12:04:31 +0100 Subject: [PATCH 3/4] Updating Rx.Angular --- angular-rx/rx.angular-tests.ts | 5 +++++ angular-rx/rx.angular.d.ts | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/angular-rx/rx.angular-tests.ts b/angular-rx/rx.angular-tests.ts index f01d8e629..3caf01170 100644 --- a/angular-rx/rx.angular-tests.ts +++ b/angular-rx/rx.angular-tests.ts @@ -1,3 +1,8 @@ +// Type definitions for angularjs extensions to rxjs +// Project: http://reactivex.io/ +// Definitions by: Mick Delaney +// Definitions: https://github.com/borisyankov/DefinitelyTyped + /// var app = angular.module('testModule'); diff --git a/angular-rx/rx.angular.d.ts b/angular-rx/rx.angular.d.ts index f32933f6d..e2d0ec8c5 100644 --- a/angular-rx/rx.angular.d.ts +++ b/angular-rx/rx.angular.d.ts @@ -1,3 +1,8 @@ +// Type definitions for angularjs extensions to rxjs +// Project: http://reactivex.io/ +// Definitions by: Mick Delaney +// Definitions: https://github.com/borisyankov/DefinitelyTyped + /// /// /// @@ -5,7 +10,7 @@ declare module Rx { interface IObservable { - safeApply($scope: ng.IScope, callback: (data: any) => void); + safeApply($scope: ng.IScope, callback: (data: any) => void): Rx.Observable; } } From f1b0c27ff14a851f8dd2dcb55f27fee79f8fec2a Mon Sep 17 00:00:00 2001 From: mick delaney Date: Fri, 3 Jul 2015 15:58:31 +0100 Subject: [PATCH 4/4] Move angular-rx to rx-angular, match Rx conventions --- {angular-rx => rx-angular}/rx.angular-tests.ts | 0 {angular-rx => rx-angular}/rx.angular.d.ts | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename {angular-rx => rx-angular}/rx.angular-tests.ts (100%) rename {angular-rx => rx-angular}/rx.angular.d.ts (100%) diff --git a/angular-rx/rx.angular-tests.ts b/rx-angular/rx.angular-tests.ts similarity index 100% rename from angular-rx/rx.angular-tests.ts rename to rx-angular/rx.angular-tests.ts diff --git a/angular-rx/rx.angular.d.ts b/rx-angular/rx.angular.d.ts similarity index 100% rename from angular-rx/rx.angular.d.ts rename to rx-angular/rx.angular.d.ts