Merge pull request #13 from sergi/fix_jsonp

Allow static JSONP callbacks

Author: mattpodwysocki

doc/readme.md

@@ -235,6 +235,7 @@ Rx.DOM.Request.jsonpRequest(settings);
 1. `settings` *(Object)*: An object with the following properties:
 		- `url` *(String)*: URL of the request
   		- `jsonp` *(String)*: The named callback parameter for the JSONP call
+  		- `jsonpCallback` *(String)*: Name of the function in the root object that JSONP will call. This is useful for when the JSONP callback is hardcoded and can't be changed
 
 #### Returns
 *(Observable)*: A hot observable containing the results from the JSONP call.

src/jsonp.js

@@ -22,60 +22,71 @@
    *  An object with the following properties
    *   - url: URL of the request
    *   - jsonp: The named callback parameter for the JSONP call
+   *   - jsonpCallback: Callback to execute. For when the JSONP callback can't be changed
    *
    * @returns {Observable} A cold observable containing the results from the JSONP call.
    */
   var getJSONPRequestCold = ajax.jsonpRequestCold = (function () {
-      var uniqueId = 0;
-      return function (settings) {
-        return new AnonymousObservable(function (observer) {
+    var uniqueId = 0;
+    var defaultCallback = function _defaultCallback(observer, data) {
+      observer.onNext(data);
+      observer.onCompleted();
+    };
 
-          if (typeof settings === 'string') {
-            settings = { url: settings }
-          }
-          if (!settings.jsonp) {
-            settings.jsonp = 'JSONPCallback';
-          }
+    return function (settings) {
+      return new AnonymousObservable(function (observer) {
+
+        if (typeof settings === 'string') {
+          settings = { url: settings };
+        }
+        if (!settings.jsonp) {
+          settings.jsonp = 'JSONPCallback';
+        }
 
-          var head = document.getElementsByTagName('head')[0] || document.documentElement,
-            tag = document.createElement('script'),
-            handler = 'rxjscallback' + uniqueId++;
+        var head = document.getElementsByTagName('head')[0] || document.documentElement,
+          tag = document.createElement('script'),
+          handler = 'rxjscallback' + uniqueId++;
+          
+        var prevFn;
+        if (typeof settings.jsonpCallback === 'string') {
+          handler = settings.jsonpCallback;
+          prevFn = root[handler];
+        }
 
-          settings.url = settings.url.replace('=' + settings.jsonp, '=' + handler);
+        settings.url = settings.url.replace('=' + settings.jsonp, '=' + handler);
 
-          root[handler] = function (data) {
-            observer.onNext(data);
-            observer.onCompleted();  
-          };
+        root[handler] = function(data) {
+          if (prevFn && typeof prevFn === 'function') {
+            prevFn(observer, data);
+          } else {
+            defaultCallback(observer, data);
+          }
+        };
 
-          tag.src = settings.url;
-          tag.async = true;
-          tag.onload = tag.onreadystatechange = function (_, abort) {
-            if ( abort || !tag.readyState || /loaded|complete/.test(tag.readyState) ) {
-              tag.onload = tag.onreadystatechange = null;
-              if (head && tag.parentNode) {
-                destroy(tag);
-              }
-              tag = undefined;
-              root[handler] = undefined;
-              delete root[handler];
-            }
-          };  
-          head.insertBefore(tag, head.firstChild);
+        var cleanup = function _cleanup() {
+          tag.onload = tag.onreadystatechange = null;
+          if (head && tag.parentNode) {
+            destroy(tag);
+          }
+          tag = undefined;
+          root[handler] = prevFn;
+        };
 
-          return function () {
-            if (!tag) { return; }
-            tag.onload = tag.onreadystatechange = null;
-            if (head && tag.parentNode) {
-              destroy(tag);
-            }
-            tag = undefined;
-            root[handler] = undefined;
-            delete root[handler];
-          };
-        });
-      };      
+        tag.src = settings.url;
+        tag.async = true;
+        tag.onload = tag.onreadystatechange = function (_, abort) {
+          if ( abort || !tag.readyState || /loaded|complete/.test(tag.readyState) ) {
+            cleanup();
+          }
+        };  
+        head.insertBefore(tag, head.firstChild);
 
+        return function () {
+          if (!tag) { return; }
+          cleanup();
+        };
+      });
+    };
   })();
 
   /**

tests/tests.ajax.js

@@ -1,4 +1,4 @@
-var xhr, requests
+var xhr, requests;
 
 module('Ajax Tests', {
 	setup: function () {
@@ -590,4 +590,59 @@ test('getJSON failure', function () {
 	);
 
 	requests[0].respond(500, { 'Content-Type': 'application/json' }, 'error');
+});
+
+asyncTest('jsonpRequest with jsonp callback success', function () {
+	window.testCallback = function(observer, data) {
+		data[0].correct = true;
+		observer.onNext(data);
+		observer.onCompleted();
+	};
+	
+	var fakeScript = "data:text/javascript;base64," + btoa(
+		'testCallback([{ "id": 123 }])'
+	);
+	
+	var source = Rx.DOM.Request.jsonpRequest({
+		url: fakeScript,
+		jsonpCallback: 'testCallback'
+	});
+
+	source.subscribe(
+		function (x) {
+			equal(123, x[0].id);
+			equal(true, x[0].correct);
+		},
+		function (e) { 
+			ok(false); 
+		},
+		function () {
+			ok(true);
+			QUnit.start();
+		}
+	);
+});
+
+asyncTest('jsonpRequest without jsonp callback success', function () {
+	var fakeScript = "data:text/javascript;base64," + btoa(
+		'testCallback([{ "id": 123 }])'
+	);
+
+	var source = Rx.DOM.Request.jsonpRequest({
+		url: fakeScript,
+		jsonpCallback: 'testCallback'
+	});
+
+	source.subscribe(
+		function (x) {
+			equal(123, x[0].id);
+		},
+		function (e) { 
+			ok(false); 
+		},
+		function () {
+			ok(true);
+			QUnit.start();
+		}
+	);
 });