ajax: add support for 'jsonp' dataType

Closes #367
madrobby · Apr 6, 2012 · 7572f37 · 7572f37
1 parent 3eff37c
commit 7572f37
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 10 deletions.
diff --git a/src/ajax.js b/src/ajax.js
@@ -143,6 +143,10 @@
       xmlTypeRE.test(mime) && 'xml' ) || 'text'
   }
 
+  function appendQuery(url, query) {
+    return (url + '&' + query).replace(/[&?]{1,2}/, '?')
+  }
+
   $.ajax = function(options){
     var settings = $.extend({}, options || {})
     for (key in $.ajaxSettings) if (settings[key] === undefined) settings[key] = $.ajaxSettings[key]
@@ -152,16 +156,20 @@
     if (!settings.crossDomain) settings.crossDomain = /^([\w-]+:)?\/\/([^\/]+)/.test(settings.url) &&
       RegExp.$2 != window.location.host
 
-    if (/=\?/.test(settings.url)) return $.ajaxJSONP(settings)
+    var dataType = settings.dataType, hasPlaceholder = /=\?/.test(settings.url)
+    if (dataType == 'jsonp' || hasPlaceholder) {
+      if (!hasPlaceholder) settings.url = appendQuery(settings.url, 'callback=?')
+      return $.ajaxJSONP(settings)
+    }
 
     if (!settings.url) settings.url = window.location.toString()
     if (settings.data && !settings.contentType) settings.contentType = 'application/x-www-form-urlencoded'
     if (isObject(settings.data)) settings.data = $.param(settings.data)
 
     if (settings.type.toLowerCase() == 'get' && settings.data)
-      settings.url = (settings.url + '&' + settings.data).replace(/[&?]{1,2}/, '?')
+      settings.url = appendQuery(settings.url, settings.data)
 
-    var mime = settings.accepts[settings.dataType],
+    var mime = settings.accepts[dataType],
         baseHeaders = { },
         protocol = /^([\w-]+:)\/\//.test(settings.url) ? RegExp.$1 : window.location.protocol,
         xhr = $.ajaxSettings.xhr(), abortTimeout
@@ -179,7 +187,7 @@
         clearTimeout(abortTimeout)
         var result, error = false
         if ((xhr.status >= 200 && xhr.status < 300) || (xhr.status == 0 && protocol == 'file:')) {
-          var dataType = settings.dataType || mimeToDataType(xhr.getResponseHeader('content-type'))
+          dataType = dataType || mimeToDataType(xhr.getResponseHeader('content-type'))
           result = xhr.responseText
 
           try {

diff --git a/test/ajax.html b/test/ajax.html
@@ -111,7 +111,7 @@ <h1>Zepto Ajax unit tests</h1>
         t.pause()
         var xhr = $.getJSON('fixtures/jsonp.js?callback=?&timestamp='+(+new Date), function(data){
           deferredResume(t, function(){
-            this.assertEqual(data.items.length, 0)
+            this.assertEqual('world', data.hello)
             this.assertEqual(0, $('script[src^=fixtures]').size())
           })
         })
@@ -120,12 +120,27 @@ <h1>Zepto Ajax unit tests</h1>
       },
 
       testAjaxGetJSONPErrorCallback: function(t){
-        var successFired, errorFired, xhr = $.ajax({
+        t.pause()
+        $.ajax({
           type: 'GET',
-          url: 'fixtures/404.js?callback=?&timestamp='+(+new Date),
+          url: 'fixtures/404.js?timestamp='+(+new Date),
+          dataType: 'jsonp',
+          success: function() { t.refute(true) },
+          error: function() { t.assert(true) },
+          complete: function() { deferredResume(t) }
+        })
+      },
+
+      testJSONPdataType: function(t){
+        t.pause()
+        $.ajax({
           dataType: 'jsonp',
-          success: function() { t.refute(true); },
-          error: function() { t.assert(true); }
+          url: 'fixtures/jsonp.js?timestamp='+(+new Date),
+          success: function(data){
+            deferredResume(t, function(){
+              this.assertEqual('world', data.hello)
+            })
+          }
         })
       },
 

diff --git a/test/fixtures/jsonp.js b/test/fixtures/jsonp.js
@@ -1 +1,7 @@
-jsonp1({"items":[]})
+for (key in window) {
+  // we can't read callback from URL, hence this hack
+  if (/^jsonp(\d+)$/.test(key)) {
+    window[key]({ hello: 'world' })
+  }
+}
+delete window.key