kylefang/angular.js
1
0
Fork 0
mirror of https://github.com/zhigang1992/angular.js.git synced 2026-04-09 09:00:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed notifyWhenNoOutstandingRequests() when using JSONP

Browse Source
This commit is contained in:
Misko Hevery
2011-02-03 12:55:23 -08:00
parent 2a9f7b7287
commit d35c1ac8b0
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Browser.js
View File

@@ -81,6 +81,7 @@ function Browser(window, document, body, XHR, $log) {
callback = post;
post = _null;
}
outstandingRequestCount ++;
if (lowercase(method) == 'json') {
var callbackId = "angular_" + Math.random() + '_' + (idCounter++);
callbackId = callbackId.replace(/\d\./, '');
@@ -89,7 +90,7 @@ function Browser(window, document, body, XHR, $log) {
script.src = url.replace('JSON_CALLBACK', callbackId);
window[callbackId] = function(data){
window[callbackId] = _undefined;
callback(200, data);
completeOutstandingRequest(callback, 200, data);
};
body.append(script);
} else {
@@ -98,7 +99,6 @@ function Browser(window, document, body, XHR, $log) {
xhr.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
xhr.setRequestHeader("Accept", "application/json, text/plain, */*");
xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
outstandingRequestCount ++;
xhr.onreadystatechange = function() {
if (xhr.readyState == 4) {
completeOutstandingRequest(callback, xhr.status || 200, xhr.responseText);
@@ -248,7 +248,7 @@ function Browser(window, document, body, XHR, $log) {
});
}
return listener;
}
};
//////////////////////////////////////////////////////////////
// Cookies API