Skip to content

Commit 7981ca5

Browse files
mrcarlosrendonmrcarlosrendon
committed
fix dumb merge issues
1 parent 7524caf commit 7981ca5

5 files changed

Lines changed: 1 addition & 21 deletions

File tree

‎src/xhr/html.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@ import "../core/document";
22
import "xhr";
33

44
d3.html = function(url, callback) {
5-
<<<<<<< HEAD
6-
return d3.xhr(url, "text/html", callback, d3_html);
7-
=======
85
return d3.xhr(url, "text/html", d3_html, callback);
9-
>>>>>>> Fix #1260
106
};
117

128
function d3_html(request) {

‎src/xhr/json.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
import "xhr";
22

33
d3.json = function(url, callback) {
4-
<<<<<<< HEAD
5-
return d3.xhr(url, "application/json", callback, d3_json);
6-
=======
74
return d3.xhr(url, "application/json", d3_json, callback);
8-
>>>>>>> Fix #1260
95
};
106

117
function d3_json(request) {

‎src/xhr/text.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
import "xhr";
22

33
d3.text = function() {
4-
<<<<<<< HEAD
5-
return d3.xhr.apply(d3, arguments, d3_text);
6-
=======
74
return d3.xhr.apply(d3, arguments[1], d3_text, arguments[2]);
8-
>>>>>>> Fix #1260
95
};
106

117
function d3_text(request) {

‎src/xhr/xhr.js‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ import "../core/identity";
44
import "../core/rebind";
55
import "../event/dispatch";
66

7-
<<<<<<< HEAD
8-
d3.xhr = function(url, mimeType, callback, contentParserCallback) {
9-
=======
7+
108
d3.xhr = function(url, mimeType, callback) {
119
return d3_xhr(url, mimeType, d3_identity, callback);
1210
};
@@ -18,7 +16,6 @@ function d3_xhr_fixCallback(callback) {
1816
}
1917

2018
function d3_xhr(url, mimeType, response, callback) {
21-
>>>>>>> Fix #1260
2219
var xhr = {},
2320
dispatch = d3.dispatch("progress", "load", "error"),
2421
headers = {},
@@ -89,7 +86,6 @@ function d3_xhr(url, mimeType, response, callback) {
8986
return xhr;
9087
};
9188

92-
xhr.response(contentParserCallback);
9389
d3.rebind(xhr, dispatch, "on");
9490

9591
if (arguments.length === 2 && typeof mimeType === "function") callback = mimeType, mimeType = null;

‎src/xhr/xml.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
import "xhr";
22

33
d3.xml = function() {
4-
<<<<<<< HEAD
5-
return d3.xhr.apply(d3, arguments, d3_xml);
6-
=======
74
return d3.xhr.apply(d3, arguments[1], d3_xml, arguments[2]);
8-
>>>>>>> Fix #1260
95
};
106

117
function d3_xml(request) {

0 commit comments

Comments
 (0)