Skip to content

Commit 85034b6

Browse files
Adding Node.js file
1 parent bf149eb commit 85034b6

File tree

5 files changed

+67
-58
lines changed

5 files changed

+67
-58
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "rx-jquery",
33
"title": "Reactive Extensions for JavaScript bindings for jQuery",
44
"description": "Library for composing asynchronous and event-based operations in JavaScript extending the jQuery library",
5-
"version": "1.0.0",
5+
"version": "1.0.1",
66
"homepage": "https://github.com/Reactive-Extensions/rxjs-jquery",
77
"author": {
88
"name": "MS Open Tech",
@@ -42,7 +42,7 @@
4242
"RxJS",
4343
"Rx"
4444
],
45-
"main": "rx.jquery.js",
45+
"main": "rx.jquery.node.js",
4646
"scripts": {
4747
"test": "grunt"
4848
}

rx.jquery.js

Lines changed: 31 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -24,35 +24,38 @@
2424
disposableEmpty = Rx.Disposable.empty,
2525
slice = Array.prototype.slice,
2626
proto = $.fn;
27-
28-
/**
29-
* Converts the jQuery Deferred to an Observable sequence
30-
* @returns {Observable} An Observable sequence created from a jQuery Deferred object.
31-
*/
32-
$.Deferred.prototype.toObservable = function () {
33-
var subject = new AsyncSubject();
34-
this.done(function () {
35-
subject.onNext(slice.call(arguments));
36-
subject.onCompleted();
37-
}).fail(function () {
38-
subject.onError(slice.call(arguments));
39-
});
40-
return subject;
41-
};
27+
// Check for deferred as of jQuery 1.5
28+
if ($.Deferred) {
29+
/**
30+
* Converts the jQuery Deferred to an Observable sequence
31+
* @returns {Observable} An Observable sequence created from a jQuery Deferred object.
32+
*/
33+
$.Deferred.prototype.toObservable = function () {
34+
var subject = new AsyncSubject();
35+
this.done(function () {
36+
subject.onNext(slice.call(arguments));
37+
subject.onCompleted();
38+
}).fail(function () {
39+
subject.onError(slice.call(arguments));
40+
});
41+
return subject;
42+
};
43+
44+
/**
45+
* Converts an existing Observable sequence to a jQuery Deferred object.
46+
* @returns {Deferred} A jQuery Deferred object wrapping the Observable sequence.
47+
*/
48+
observableProto.toDeferred = function () {
49+
var deferred = $.Deferred();
50+
this.subscribe(function (value) {
51+
deferred.resolve(value);
52+
}, function (e) {
53+
deferred.reject(e);
54+
});
55+
return deferred;
56+
};
57+
}
4258

43-
/**
44-
* Converts an existing Observable sequence to a jQuery Deferred object.
45-
* @returns {Deferred} A jQuery Deferred object wrapping the Observable sequence.
46-
*/
47-
observableProto.toDeferred = function () {
48-
var deferred = $.Deferred();
49-
this.subscribe(function (value) {
50-
deferred.resolve(value);
51-
}, function (e) {
52-
deferred.reject(e);
53-
});
54-
return deferred;
55-
};
5659

5760
//in order to support jQuery 1.6.*
5861
if ($.Callbacks) {

rx.jquery.min.js

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

rx.jquery.node.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
var Rx = require('rx');
2+
require('./rx.jquery');
3+
module.exports = Rx;

src/rx-jquery.js

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,35 @@
1+
// Check for deferred as of jQuery 1.5
2+
if ($.Deferred) {
3+
/**
4+
* Converts the jQuery Deferred to an Observable sequence
5+
* @returns {Observable} An Observable sequence created from a jQuery Deferred object.
6+
*/
7+
$.Deferred.prototype.toObservable = function () {
8+
var subject = new AsyncSubject();
9+
this.done(function () {
10+
subject.onNext(slice.call(arguments));
11+
subject.onCompleted();
12+
}).fail(function () {
13+
subject.onError(slice.call(arguments));
14+
});
15+
return subject;
16+
};
117

2-
/**
3-
* Converts the jQuery Deferred to an Observable sequence
4-
* @returns {Observable} An Observable sequence created from a jQuery Deferred object.
5-
*/
6-
$.Deferred.prototype.toObservable = function () {
7-
var subject = new AsyncSubject();
8-
this.done(function () {
9-
subject.onNext(slice.call(arguments));
10-
subject.onCompleted();
11-
}).fail(function () {
12-
subject.onError(slice.call(arguments));
13-
});
14-
return subject;
15-
};
18+
/**
19+
* Converts an existing Observable sequence to a jQuery Deferred object.
20+
* @returns {Deferred} A jQuery Deferred object wrapping the Observable sequence.
21+
*/
22+
observableProto.toDeferred = function () {
23+
var deferred = $.Deferred();
24+
this.subscribe(function (value) {
25+
deferred.resolve(value);
26+
}, function (e) {
27+
deferred.reject(e);
28+
});
29+
return deferred;
30+
};
31+
}
1632

17-
/**
18-
* Converts an existing Observable sequence to a jQuery Deferred object.
19-
* @returns {Deferred} A jQuery Deferred object wrapping the Observable sequence.
20-
*/
21-
observableProto.toDeferred = function () {
22-
var deferred = $.Deferred();
23-
this.subscribe(function (value) {
24-
deferred.resolve(value);
25-
}, function (e) {
26-
deferred.reject(e);
27-
});
28-
return deferred;
29-
};
3033

3134
//in order to support jQuery 1.6.*
3235
if ($.Callbacks) {

0 commit comments

Comments
 (0)