Skip to content

Commit 3bbcd57

Browse files
committed
Merge remote-tracking branch 'origin/fix-xhr-notext' into 3.4.12
2 parents d62f3d4 + f7d39ba commit 3bbcd57

3 files changed

Lines changed: 18 additions & 7 deletions

File tree

d3.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1842,7 +1842,7 @@
18421842
};
18431843
function respond() {
18441844
var status = request.status, result;
1845-
if (!status && request.responseText || status >= 200 && status < 300 || status === 304) {
1845+
if (!status && d3_xhrHasResponse(request) || status >= 200 && status < 300 || status === 304) {
18461846
try {
18471847
result = response.call(xhr, request);
18481848
} catch (e) {
@@ -1914,6 +1914,10 @@
19141914
callback(error == null ? request : null);
19151915
} : callback;
19161916
}
1917+
function d3_xhrHasResponse(request) {
1918+
var type = request.responseType;
1919+
return type && type !== "text" ? request.response : request.responseText;
1920+
}
19171921
d3.dsv = function(delimiter, mimeType) {
19181922
var reFormat = new RegExp('["' + delimiter + "\n]"), delimiterCode = delimiter.charCodeAt(0);
19191923
function dsv(url, row, callback) {

0 commit comments

Comments
 (0)