Merge branch 'jsdom' of https://github.com/jasondavies/d3 into 2.9.0

d3 · Apr 15, 2012 · c9b77a1 · c9b77a1
2 parents 4ffe6b4 + e7025c7
commit c9b77a1
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -21,7 +21,7 @@
   },
   "main": "index.js",
   "dependencies": {
-    "jsdom": "0.2.12",
+    "jsdom": "0.2.14",
     "sizzle": "1.1.x"
   },
   "devDependencies": {

diff --git a/src/package.js b/src/package.js
@@ -10,7 +10,7 @@ require("util").puts(JSON.stringify({
   "repository": {"type": "git", "url": "http://github.com/mbostock/d3.git"},
   "main": "index.js",
   "dependencies": {
-    "jsdom": "0.2.12",
+    "jsdom": "0.2.14",
     "sizzle": "1.1.x"
   },
   "devDependencies": {

diff --git a/test/core/selection-html-test.js b/test/core/selection-html-test.js
@@ -98,16 +98,13 @@ suite.addBatch({
       assert.equal(div[0][1].lastChild.tagName, "I");
       assert.equal(div[0][1].lastChild.textContent, "1");
     },
-    /*
-    https://github.com/tmpvar/jsdom/issues/276
     "clears the inner HTML as null": function(div) {
       div.html(null);
       assert.equal(div[0][0].innerHTML, "");
       assert.isNull(div[0][0].firstChild);
       assert.equal(div[0][1].innerHTML, "");
       assert.isNull(div[0][1].firstChild);
     },
-    */
     "clears the inner HTML as a function": function(div) {
       div.html(function() { return ""; });
       assert.equal(div[0][0].innerHTML, "");

diff --git a/test/core/selection-text-test.js b/test/core/selection-text-test.js
@@ -27,7 +27,6 @@ suite.addBatch({
       assert.equal(document.body.textContent, "<h1>Hello, world!</h1>");
       assert.equal(document.body.firstChild.nodeType, document.TEXT_NODE);
     },
-    /* <https://github.com/tmpvar/jsdom/issues/276>
     "clears the text content as null": function(body) {
       body.text(null);
       assert.equal(document.body.textContent, "");
@@ -44,7 +43,6 @@ suite.addBatch({
       body.text(function() { return undefined; });
       assert.equal(document.body.textContent, "");
     },
-    */
     "ignores null nodes": function() {
       var body = d3.select("body");
       body[0][0] = null;