diff options
Diffstat (limited to 'src/ng')
| -rw-r--r-- | src/ng/httpBackend.js | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/ng/httpBackend.js b/src/ng/httpBackend.js index 71592a56..0a0e1f71 100644 --- a/src/ng/httpBackend.js +++ b/src/ng/httpBackend.js @@ -28,12 +28,11 @@ var XHR = window.XMLHttpRequest || function() { */ function $HttpBackendProvider() { this.$get = ['$browser', '$window', '$document', function($browser, $window, $document) { - return createHttpBackend($browser, XHR, $browser.defer, $window.angular.callbacks, - $document[0], $window.location.protocol.replace(':', '')); + return createHttpBackend($browser, XHR, $browser.defer, $window.angular.callbacks, $document[0]); }]; } -function createHttpBackend($browser, XHR, $browserDefer, callbacks, rawDocument, locationProtocol) { +function createHttpBackend($browser, XHR, $browserDefer, callbacks, rawDocument) { var ABORTED = -1; // TODO(vojta): fix the signature @@ -113,14 +112,14 @@ function createHttpBackend($browser, XHR, $browserDefer, callbacks, rawDocument, } function completeRequest(callback, status, response, headersString) { - var protocol = locationProtocol || urlResolve(url).protocol; + var protocol = urlResolve(url).protocol; // cancel timeout and subsequent timeout promise resolution timeoutId && $browserDefer.cancel(timeoutId); jsonpDone = xhr = null; // fix status code for file protocol (it's always 0) - status = (protocol == 'file') ? (response ? 200 : 404) : status; + status = (protocol == 'file' && status === 0) ? (response ? 200 : 404) : status; // normalize IE bug (http://bugs.jquery.com/ticket/1450) status = status == 1223 ? 204 : status; |