From e9b57f9df8eb4aaa2c1657d303c78dc68828091b Mon Sep 17 00:00:00 2001
From: Vojta Jina
Date: Wed, 10 Aug 2011 16:03:26 +0200
Subject: fix($browser.xhr): respond with internal -2 status on jsonp error

If jsonp is not successfull, we return internal status -2.
This internal status should by normalized by $xhr into 0,
but $xhr needs to distinguish between jsonp-error/abort/timeout (all status 0).
---
 src/service/browser.js | 2 +-
 src/service/xhr.js     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/service/browser.js b/src/service/browser.js
index 65a63f62..49bfe99e 100644
--- a/src/service/browser.js
+++ b/src/service/browser.js
@@ -109,7 +109,7 @@ function Browser(window, document, body, XHR, $log, $sniffer) {
         if (window[callbackId].data) {
           completeOutstandingRequest(callback, 200, window[callbackId].data);
         } else {
-          completeOutstandingRequest(callback);
+          completeOutstandingRequest(callback, -2);
         }
         delete window[callbackId];
         body[0].removeChild(script);
diff --git a/src/service/xhr.js b/src/service/xhr.js
index 7970622b..e9421caf 100644
--- a/src/service/xhr.js
+++ b/src/service/xhr.js
@@ -165,7 +165,7 @@
            function() {
          element(':button:contains("Invalid JSONP")').click();
          element(':button:contains("fetch")').click();
-         expect(binding('code')).toBe('code=');
+         expect(binding('code')).toBe('code=-2');
          expect(binding('response')).toBe('response=Request failed');
        });
      </doc:scenario>
-- 
cgit v1.2.3