fixes to $.ajaxJSONP

src/ajax.js

@@ -75,32 +75,40 @@
 
     var callbackName = 'jsonp' + (++jsonpID),
       script = document.createElement('script'),
-      abort = function(){
+      cleanup = function() {
+        clearTimeout(abortTimeout)
         $(script).remove()
-        if (callbackName in window) window[callbackName] = empty
+        delete window[callbackName]
+      },
+      abort = function(){
+        cleanup()
         ajaxComplete('abort', xhr, options)
       },
       xhr = { abort: abort }, abortTimeout
 
-    if (options.error) script.onerror = function() {
-      xhr.abort()
-      options.error()
+    serializeData(options)
+
+    if (ajaxBeforeSend(xhr, options) === false) {
+      ajaxError(null, 'abort', xhr, options)
+      return false
     }
 
     window[callbackName] = function(data){
-      clearTimeout(abortTimeout)
-      $(script).remove()
-      delete window[callbackName]
+      cleanup()
       ajaxSuccess(data, xhr, options)
     }
 
-    serializeData(options)
+    script.onerror = function() {
+      cleanup()
+      ajaxError(null, 'error', xhr, options)
+    }
+
     script.src = options.url.replace(/=\?/, '=' + callbackName)
     $('head').append(script)
 
     if (options.timeout > 0) abortTimeout = setTimeout(function(){
-        xhr.abort()
-        ajaxComplete('timeout', xhr, options)
+        cleanup()
+        ajaxError(null, 'timeout', xhr, options)
       }, options.timeout)
 
     return xhr

test/ajax.html

@@ -134,6 +134,17 @@ <h1>Zepto Ajax unit tests</h1>
         })
       },
 
+      testAjaxGetJSONPBeforeSendCallback: function(t){
+        t.pause()
+        var xhr = $.ajaxJSONP({
+          url: 'fixtures/jsonp.js?callback=?&timestamp='+(+new Date),
+          beforeSend: function() {
+            t.assert(true)
+            deferredResume(t)
+          }
+        })
+      },
+
       testAjaxGetJSONPErrorCallback: function(t){
         t.pause()
         $.ajax({
@@ -146,6 +157,19 @@ <h1>Zepto Ajax unit tests</h1>
         })
       },
 
+      testAjaxGetJSONPErrorWithoutErrorCallback: function(t){
+        t.pause()
+        $.ajax({
+          type: 'GET',
+          url: 'fixtures/404.js?timestamp='+(+new Date),
+          dataType: 'jsonp',
+          complete: function() {
+            t.assert(true)
+            deferredResume(t)
+          }
+        })
+      },
+
       testJSONPdataType: function(t){
         t.pause()
         $.ajax({