Skip to content

Commit 8db56a0

Browse files
mattpodwysockimattpodwysocki
committed
Moving to dist
1 parent d73ef1b commit 8db56a0

File tree

16 files changed

+24
-30
lines changed

16 files changed

+24
-30
lines changed

‎Gruntfile.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ module.exports = function (grunt) {
3434
'src/scopescheduler.js',
3535
'src/outro.js'
3636
],
37-
dest: 'rx.angular.js'
37+
dest: 'dist/rx.angular.js'
3838
}
3939
},
4040
uglify: {
4141
basic: {
42-
src: ['<banner>', 'rx.angular.js'],
43-
dest: 'rx.angular.min.js'
42+
src: ['<banner>', 'dist/rx.angular.js'],
43+
dest: 'dist/rx.angular.min.js'
4444
}
4545
},
4646
qunit: {

‎bower.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"name": "rx-angular",
3-
"version": "0.0.8",
3+
"version": "0.0.10",
44
"main": "rx.angular.js",
55
"dependencies": {
6-
"Rx": "*"
6+
"rxjs": "*"
77
},
88
"ignore": [
99
".*",

‎rx.angular.js renamed to ‎dist/rx.angular.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
// Because of build optimizers
2424
if (typeof define === 'function' && define.amd) {
2525
define(['rx', 'angular', 'exports'], function (Rx, angular, exports) {
26-
root.Rx = factory(root, exports, Rx, jQuery);
26+
root.Rx = factory(root, exports, Rx, angular);
2727
return root.Rx;
2828
});
2929
} else if (typeof module == 'object' && module && module.exports == freeExports) {
@@ -39,16 +39,14 @@
3939
disposableCreate = Rx.Disposable.create,
4040
SingleAssignmentDisposable = Rx.SingleAssignmentDisposable,
4141
CompositeDisposable = Rx.CompositeDisposable,
42+
AnonymousObservable = Rx.AnonymousObservable,
4243
Scheduler = Rx.Scheduler,
4344
noop = Rx.helpers.noop;
4445

4546
// Utilities
4647
var toString = Object.prototype.toString,
4748
slice = Array.prototype.slice;
4849

49-
function isFunction (fn) {
50-
return toString.call(fn) === '[object Function]';
51-
}
5250
/**
5351
* @ngdoc overview
5452
* @name rx
@@ -118,7 +116,7 @@
118116

119117
observableProto.safeApply = function($scope, fn){
120118

121-
fn = isFunction(fn) ? fn : noop;
119+
fn = angular.isFunction(fn) ? fn : noop;
122120

123121
return this.doAction(function(data){
124122
($scope.$$phase || $scope.$root.$$phase) ? fn(data) : $scope.$apply(function(){
@@ -344,14 +342,15 @@
344342
observer.onCompleted.bind(observer)
345343
));
346344

347-
$scope.on('$destroy', function () {
345+
$scope.$on('$destroy', function () {
348346
!m.isDisposed && m.dispose();
349347
});
350348

351349
return m;
352350
});
353351
};
354352
}]);
353+
355354
var now = Date.now || (+new Date());
356355

357356
var ScopeScheduler = Rx.ScopeScheduler = (function () {

‎dist/rx.angular.min.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/$createObservableFunction/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ <h2>Reactive Angular - Wikipedia Example</h2>
2323

2424
<script src="http://cdnjs.cloudflare.com/ajax/libs/rxjs/2.2.27/rx.lite.compat.js"></script>
2525
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.2.19/angular.min.js"></script>
26-
<script src="../../rx.angular.js"></script>
26+
<script src="../../dist/rx.angular.js"></script>
2727
<script src="app.js"></script>
2828
</div>
2929
</body>

‎examples/$toObservable/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ <h2>Reactive Angular - Wikipedia Example</h2>
2121

2222
<script src="http://cdnjs.cloudflare.com/ajax/libs/rxjs/2.2.27/rx.lite.compat.js"></script>
2323
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.2.19/angular.min.js"></script>
24-
<script src="../../rx.angular.js"></script>
24+
<script src="../../dist/rx.angular.js"></script>
2525
<script src="app.js"></script>
2626
</div>
2727
</body>

‎examples/canvaspaint/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ <h1>RxJS for AngularJS Bindings Canvas Paint Example</h1>
2323
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.2.19/angular.js"></script>
2424
<script src="http://cdn.jsdelivr.net/rxjs/2.2.27/rx.all.js"></script>
2525

26-
<script src="../../rx.angular.js"></script>
26+
<script src="../../dist/rx.angular.js"></script>
2727
<script src="app.js"></script>
2828
</body>
2929
</html>

‎examples/draganddrop/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ <h1>RxJS for AngularJS Bindings Drag and Drop Example</h1>
2121
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.2.19/angular.js"></script>
2222
<script src="http://cdn.jsdelivr.net/rxjs/2.2.27/rx.all.js"></script>
2323

24-
<script src="../../rx.angular.js"></script>
24+
<script src="../../dist/rx.angular.js"></script>
2525
<script src="app.js"></script>
2626
</body>
2727
</html>

‎examples/konamicode/index.html

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
<h1>RxJS for AngularJS Bindings Konami Code example</h1>
1616
<p class="lead">Example to show the Konami Code in action!</p>
1717
</div>
18-
<div class="row-fluid">
18+
<div class="row">
1919
<h3>Enter the Konami Code</h3>
2020
<p>Up Up Down Down Left Right Left Right B A</p>
2121
</div>
22-
<div class="row-fluid">
22+
<div class="row">
2323
<h1 ng-if="konami">
2424
KONAMI
2525
</h1>
@@ -28,8 +28,7 @@ <h1 ng-if="konami">
2828
<!-- make sure you include angular before Rx -->
2929
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.2.19/angular.js"></script>
3030
<script src="http://cdnjs.cloudflare.com/ajax/libs/rxjs/2.2.27/rx.all.js"></script>
31-
<script src="http://cdn.jsdelivr.net/rxjs/2.2.27/rx.aggregates.js"></script>
32-
<script src="../../rx.angular.js"></script>
31+
<script src="../../dist/rx.angular.js"></script>
3332
<script src="app.js"></script>
3433
</body>
3534
</html>

‎examples/observeonscope/observeonscope.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ <h2>Reactive Angular</h2>
1818
<input type="text" ng-model="name" />
1919
<script src="http://cdnjs.cloudflare.com/ajax/libs/rxjs/2.2.27/rx.lite.compat.js"></script>
2020
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.2.19/angular.min.js"></script>
21-
<script src="../../rx.angular.js"></script>
21+
<script src="../../dist/rx.angular.js"></script>
2222
<script src="app.js"></script>
2323
</div>
2424
</body>

‎examples/timeflies/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ <h1>RxJS for AngularJS Bindings Time Flies Example</h1>
2020
</div>
2121
<script src="http://cdnjs.cloudflare.com/ajax/libs/rxjs/2.2.10/rx.lite.js"></script>
2222
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.0.7/angular.min.js"></script>
23-
<script src="../../rx.angular.js"></script>
23+
<script src="../../dist/rx.angular.js"></script>
2424
<script src="app.js"></script>
2525
</body>
2626
</html>

‎nuget/RxJS-Bridges-Angular/RxJS-Bridges-Angular.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</dependencies>
2323
</metadata>
2424
<files>
25-
<file src="..\..\rx.angular.js" target="content\Scripts\rx.angular.js" />
26-
<file src="..\..\rx.angular.min.js" target="content\Scripts\rx.angular.min.js" />
25+
<file src="..\..\dist\rx.angular.js" target="content\Scripts\rx.angular.js" />
26+
<file src="..\..\dist\rx.angular.min.js" target="content\Scripts\rx.angular.min.js" />
2727
</files>
2828
</package>

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "rx-angular",
33
"title": "The Reactive Extensions Bindings for the AngularJS.",
44
"description": "Library for bridging between RxJS and AngularJS.",
5-
"version": "0.0.8",
5+
"version": "0.0.10",
66
"homepage": "https://github.com/Reactive-Extensions/rx.angular.js",
77
"author": {
88
"name": "MS Open Tech"

‎rx.angular.min.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎src/basicheader.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,3 @@
1111
// Utilities
1212
var toString = Object.prototype.toString,
1313
slice = Array.prototype.slice;
14-
15-
function isFunction (fn) {
16-
return toString.call(fn) === '[object Function]';
17-
}

‎src/safeApply.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
observableProto.safeApply = function($scope, fn){
22

3-
fn = isFunction(fn) ? fn : noop;
3+
fn = angular.isFunction(fn) ? fn : noop;
44

55
return this.doAction(function(data){
66
($scope.$$phase || $scope.$root.$$phase) ? fn(data) : $scope.$apply(function(){

0 commit comments

Comments
 (0)