Merge branch '2.9.4'

paulscott56 · Jun 19, 2012 · ad43a2e · ad43a2e
2 parents b6153d2 + 4ff1d66
commit ad43a2e
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 19 deletions.
diff --git a/d3.v2.js b/d3.v2.js
@@ -10,7 +10,7 @@ try {
     d3_style_setProperty.call(this, name, value + "", priority);
   };
 }
-d3 = {version: "2.9.3"}; // semver
+d3 = {version: "2.9.4"}; // semver
 function d3_class(ctor, properties) {
   try {
     for (var key in properties) {
@@ -494,7 +494,7 @@ d3.xhr = function(url, mime, callback) {
   req.onreadystatechange = function() {
     if (req.readyState === 4) {
       var s = req.status;
-      callback(s >= 200 && s < 300 || s === 304 ? req : null);
+      callback(!s && req.response || s >= 200 && s < 300 || s === 304 ? req : null);
     }
   };
   req.send(null);
@@ -1515,7 +1515,7 @@ var d3_select = function(s, n) { return n.querySelector(s); },
 
 // Prefer Sizzle, if available.
 if (typeof Sizzle === "function") {
-  d3_select = function(s, n) { return Sizzle(s, n)[0]; };
+  d3_select = function(s, n) { return Sizzle(s, n)[0] || null; };
   d3_selectAll = function(s, n) { return Sizzle.uniqueSort(Sizzle(s, n)); };
   d3_selectMatches = Sizzle.matchesSelector;
 }

diff --git a/d3.v2.min.js b/d3.v2.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "d3",
-  "version": "2.9.3",
+  "version": "2.9.4",
   "description": "A small, free JavaScript library for manipulating documents based on data.",
   "keywords": [
     "dom",

diff --git a/src/core/core.js b/src/core/core.js
@@ -1 +1 @@
-d3 = {version: "2.9.3"}; // semver
+d3 = {version: "2.9.4"}; // semver
diff --git a/src/core/selection.js b/src/core/selection.js
@@ -11,7 +11,7 @@ var d3_select = function(s, n) { return n.querySelector(s); },
 
 // Prefer Sizzle, if available.
 if (typeof Sizzle === "function") {
-  d3_select = function(s, n) { return Sizzle(s, n)[0]; };
+  d3_select = function(s, n) { return Sizzle(s, n)[0] || null; };
   d3_selectAll = function(s, n) { return Sizzle.uniqueSort(Sizzle(s, n)); };
   d3_selectMatches = Sizzle.matchesSelector;
 }

diff --git a/src/core/xhr.js b/src/core/xhr.js
@@ -7,7 +7,7 @@ d3.xhr = function(url, mime, callback) {
   req.onreadystatechange = function() {
     if (req.readyState === 4) {
       var s = req.status;
-      callback(s >= 200 && s < 300 || s === 304 ? req : null);
+      callback(!s && req.response || s >= 200 && s < 300 || s === 304 ? req : null);
     }
   };
   req.send(null);

diff --git a/test/core/transition-test.js b/test/core/transition-test.js
@@ -34,32 +34,36 @@ suite.export(module);
 
 var suite = vows.describe("transition");
 
+// Subtransitions
 suite.addBatch({
-
-  // Subtransitions
   "select": require("./transition-test-select"),
   "selectAll": require("./transition-test-selectAll"),
-  "transition": require("./transition-test-transition"),
+  "transition": require("./transition-test-transition")
+});
 
-  // Content
+// Content
+suite.addBatch({
   "attr": require("./transition-test-attr"),
   "attrTween": require("./transition-test-attrTween"),
   "style": require("./transition-test-style"),
   "styleTween": require("./transition-test-styleTween"),
   "text": require("./transition-test-text"),
-  "remove": require("./transition-test-remove"),
+  "remove": require("./transition-test-remove")
+});
 
-  // Animation
+// Animation
+suite.addBatch({
   "delay": require("./transition-test-delay"),
-  "duration": require("./transition-test-duration"),
+  "duration": require("./transition-test-duration")
+});
 
-  // Control
+// Control
+suite.addBatch({
   "each": require("./transition-test-each"),
   "call": require("./transition-test-call"),
   "tween": require("./transition-test-tween"),
   "id": require("./transition-test-id"),
   "time": require("./transition-test-time")
-
 });
 
 suite.export(module);
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		d3 = {version: "2.9.3"}; // semver
		d3 = {version: "2.9.4"}; // semver