Updating to use publish/refcount for events

Author: mattpodwysocki

Gruntfile.js

@@ -27,7 +27,11 @@ module.exports = function (grunt) {
                     'src/license.js',
                     'src/intro.js',
                     'src/basicheader.js',
-                    'src/rx-jquery.js',
+                    'src/deferred.js',
+                    'src/callbacks.js',
+                    'src/events.js',
+                    'src/animation.js',
+                    'src/ajax.js',
                     'src/outro.js'
                 ],
                 dest: 'rx.jquery.js'

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "Rx-jQuery",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "main": "rx.jquery.js",
   "dependencies": {
     "rxjs": "*"

nuget/RxJS-Bridges-jQuery/RxJS-Bridges-jQuery.nuspec

@@ -4,7 +4,7 @@
     <id>RxJS-Bridges-jQuery</id>
     <title>Reactive Extensions for JavaScript - Bridges to jQuery </title>
     <!-- Automatically updated by build, keeping fixed dev build number here in case of local build -->
-    <version>1.1.2</version>
+    <version>1.1.3</version>
     <authors>Microsoft Corporation</authors>
     <description>This project provides Reactive Extensions for JavaScript (RxJS) bindings for jQuery to abstract over the event binding, Ajax and Deferreds.</description>
     <projectUrl>https://github.com/Reactive-Extensions/rxjs-jquery</projectUrl>
@@ -15,7 +15,8 @@
     <tags>Rx RxJS Reactive Extensions Observable</tags>
     <dependencies>
       <!-- Automatically updated by build, keeping fixed dev build number here in case of local build -->
-      <dependency id="RxJS-Main" version="2.1.15" />
+      <dependency id="RxJS-Main" version="2.1" />
+      <dependency id="RxJS-Binding" version="2.1" />
       <dependency id="jQuery" />
     </dependencies>
   </metadata>

package.json

@@ -2,7 +2,7 @@
   "name": "rx-jquery",
   "title": "Reactive Extensions for JavaScript bindings for jQuery",
   "description": "Library for composing asynchronous and event-based operations in JavaScript extending the jQuery library",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "homepage": "https://github.com/Reactive-Extensions/rxjs-jquery",
   "author": {
     "name": "MS Open Tech",

rx.jquery.js

@@ -55,33 +55,29 @@
             return deferred;  
         };        
     }
-
-
-    //in order to support jQuery 1.6.*
+        //in order to support jQuery 1.6.*
     if ($.Callbacks) {
 
         /**
          * Converts an existing Callbacks object to an Observable sequence
          * @returns {Observable} An Observable sequence created from a jQuery Callbacks object.
          */
         $.Callbacks.prototype.toObservable = function () {
-                var parent = this;
-                return observableCreate(function (observer) {
-
-                    function handler(values) {
-                        observer.onNext(values);
-                    }
+            var parent = this;
+            return observableCreate(function (observer) {
 
-                    parent.add(handler);
+                function handler(values) {
+                    observer.onNext(values);
+                }
 
-                    return function () {
-                        parent.remove(handler);
-                    };
-                });
-            };
-    }
+                parent.add(handler);
 
-    if (!!proto.on) {
+                return function () {
+                    parent.remove(handler);
+                };
+            });
+        };
+    }    if (!!proto.on) {
         /**
          * Attach an event handler function for one or more events to the selected elements as an Observable sequence.
          *
@@ -106,7 +102,7 @@
                 return function() {
                     parent.off.apply(parent, args);
                 };
-            });          
+            }).publish().refCount();          
         };
     }
 
@@ -131,7 +127,7 @@
             return function() {
                 parent.unbind(eventType, eventData, handler);
             };
-        });
+        }).publish().refCount();
     };
 
     /**
@@ -156,7 +152,7 @@
             return function() {
                 parent.undelegate(selector, eventType, handler);
             };
-        });
+        }).publish().refCount();
     };
 
     // Removed as of 1.9
@@ -182,7 +178,7 @@
                 return function() {
                     parent.die(eventType, data, handler);
                 };
-            });
+            }).publish().refCount();
         };
     }
 
@@ -434,7 +430,6 @@
             parent.ready(handler);
         });
     };
-
     function handeAnimation(jQueryProto, method, args) {
         var options = args[0];
 
@@ -672,7 +667,6 @@
     proto.toggleAsObservable = function(duration, easing) {
         return handeAnimation(this, 'toggle', arguments);
     };
-
     var ajaxAsObservable = $.ajaxAsObservable = function(settings) {      
         var subject = new AsyncSubject();
 

rx.jquery.min.js

@@ -0,0 +1,65 @@
+
+    var ajaxAsObservable = $.ajaxAsObservable = function(settings) {      
+        var subject = new AsyncSubject();
+
+        var internalSettings = {
+            success: function(data, textStatus, jqXHR) {
+                subject.onNext({ data: data, textStatus: textStatus, jqXHR: jqXHR });
+                subject.onCompleted();
+            },
+            error: function(jqXHR, textStatus, errorThrown) {
+                subject.onError({ jqXHR: jqXHR, textStatus: textStatus, errorThrown: errorThrown });
+            }
+        };
+        
+        $.extend(true, internalSettings, settings);
+
+        $.ajax(internalSettings);
+
+        return subject;
+    };
+
+    /**
+     * Load data from the server using a HTTP GET request as an Observable sequence.
+     *
+     * @param {String} url A string containing the URL to which the request is sent.
+     * @param {Object} [data] A plain object or string that is sent to the server with the request.
+     * @param {String} [dataType] The type of data expected from the server. Default: Intelligent Guess (xml, json, script, or html).
+     * @returns {Observable} An Observable sequence which wraps the jQuery get method.       
+     */
+    $.getAsObservable = function(url, data, dataType) {
+        return ajaxAsObservable({ url: url, dataType: dataType, data: data });
+    };
+
+    /**
+     * Load JSON-encoded data from the server using a GET HTTP request as an Observable sequence.
+     *
+     * @param {String} url A string containing the URL to which the request is sent.
+     * @param {Object} [data] A plain object or string that is sent to the server with the request.
+     * @returns {Observable} An Observable sequence which wraps the jQuery getJSON method.       
+     */
+    $.getJSONAsObservable = function(url, data) {
+        return ajaxAsObservable({ url: url, dataType: 'json', data: data });
+    };
+
+    /**
+     * Load a JavaScript file from the server using a GET HTTP request, then execute it as an Observable sequence.
+     *
+     * @param {String} url A string containing the URL to which the request is sent.
+     * @returns {Observable} An Observable sequence which wraps the jQuery getJSON method.       
+     */
+    $.getScriptAsObservable = function(url) {
+        return ajaxAsObservable({ url: url, dataType: 'script'});
+    };
+
+    /**
+     * Load data from the server using a HTTP POST request as an Observable sequence.
+     *
+     * @param {String} url A string containing the URL to which the request is sent.
+     * @param {Object} [data] A plain object or string that is sent to the server with the request.
+     * @param {String} [dataType] The type of data expected from the server. Default: Intelligent Guess (xml, json, script, or html).
+     * @returns {Observable} An Observable sequence which wraps the jQuery get method.       
+     */
+    $.postAsObservable = function(url, data, dataType) {
+        return ajaxAsObservable({ url: url, dataType: dataType, data: data, type: 'POST'});	
+    };