Skip to content

Commit 65ec4c7

Browse files
committed
Fix for cross-domain d3.dsv in IE9.
In some cases IE9 processes the opening of an XDomainRequest synchronously, so by the time we were setting the response function to parse the DSV file, it was too late. So instead we use the internal d3_xhr method to set the response function before the request is sent. This is a continuation of fix d3#1260.
1 parent 525cbbf commit 65ec4c7

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "d3",
3-
"version": "3.3.10",
3+
"version": "3.3.11",
44
"main": "d3.js",
55
"scripts": [
66
"d3.js"

component.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"animation",
1111
"canvas"
1212
],
13-
"version": "3.3.10",
13+
"version": "3.3.11",
1414
"main": "index-browserify.js",
1515
"scripts": [
1616
"d3.js",

d3.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
d3 = function() {
22
var d3 = {
3-
version: "3.3.10"
3+
version: "3.3.11"
44
};
55
if (!Date.now) Date.now = function() {
66
return +new Date();
@@ -1937,11 +1937,11 @@ d3 = function() {
19371937
var reFormat = new RegExp('["' + delimiter + "\n]"), delimiterCode = delimiter.charCodeAt(0);
19381938
function dsv(url, row, callback) {
19391939
if (arguments.length < 3) callback = row, row = null;
1940-
var xhr = d3.xhr(url, mimeType, callback);
1940+
var xhr = d3_xhr(url, mimeType, row == null ? response : typedResponse(row), callback);
19411941
xhr.row = function(_) {
19421942
return arguments.length ? xhr.response((row = _) == null ? response : typedResponse(_)) : row;
19431943
};
1944-
return xhr.row(row);
1944+
return xhr;
19451945
}
19461946
function response(request) {
19471947
return dsv.parse(request.responseText);

d3.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "d3",
3-
"version": "3.3.10",
3+
"version": "3.3.11",
44
"description": "A small, free JavaScript library for manipulating documents based on data.",
55
"keywords": [
66
"dom",

src/dsv/dsv.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ d3.dsv = function(delimiter, mimeType) {
77

88
function dsv(url, row, callback) {
99
if (arguments.length < 3) callback = row, row = null;
10-
var xhr = d3.xhr(url, mimeType, callback);
10+
var xhr = d3_xhr(url, mimeType, row == null ? response : typedResponse(row), callback);
1111

1212
xhr.row = function(_) {
1313
return arguments.length
1414
? xhr.response((row = _) == null ? response : typedResponse(_))
1515
: row;
1616
};
1717

18-
return xhr.row(row);
18+
return xhr;
1919
}
2020

2121
function response(request) {

src/start.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
d3 = (function(){
2-
var d3 = {version: "3.3.10"}; // semver
2+
var d3 = {version: "3.3.11"}; // semver

0 commit comments

Comments
 (0)