Fix a bug in selector functions.

They weren't being invoked with the correct syntax (being passed the data and
index, with the current node as the context). This commit also removes the
d3_array wrapper, which does not appear to be necessary; I've forgotten why it
was there in the first place.

d3.js

@@ -7,24 +7,6 @@ if (!Object.create) Object.create = function(o) {
   f.prototype = o;
   return new f;
 };
-var d3_array = d3_arraySlice; // conversion for NodeLists
-
-function d3_arrayCopy(pseudoarray) {
-  var i = -1, n = pseudoarray.length, array = [];
-  while (++i < n) array.push(pseudoarray[i]);
-  return array;
-}
-
-function d3_arraySlice(pseudoarray) {
-  return Array.prototype.slice.call(pseudoarray);
-}
-
-try {
-  d3_array(document.documentElement.childNodes)[0].nodeType;
-} catch(e) {
-  d3_array = d3_arrayCopy;
-}
-
 var d3_arraySubclass = [].__proto__?
 
 // Until ECMAScript supports array subclassing, prototype injection works well.
@@ -1207,15 +1189,15 @@ d3.select = function(selector) {
 d3.selectAll = function(selector) {
   return typeof selector === "string"
       ? d3_selectionRoot.selectAll(selector)
-      : d3_selection([d3_array(selector)]); // assume node[]
+      : d3_selection([selector]); // assume node[]
 };
 function d3_selection(groups) {
   d3_arraySubclass(groups, d3_selectionPrototype);
   return groups;
 }
 
 var d3_select = function(s, n) { return n.querySelector(s); },
-    d3_selectAll = function(s, n) { return d3_array(n.querySelectorAll(s)); };
+    d3_selectAll = function(s, n) { return n.querySelectorAll(s); };
 
 // Prefer Sizzle, if available.
 if (typeof Sizzle === "function") {
@@ -1247,7 +1229,7 @@ d3_selectionPrototype.select = function(selector) {
     subgroup.parentNode = (group = this[j]).parentNode;
     for (var i = -1, n = group.length; ++i < n;) {
       if (node = group[i]) {
-        subgroup.push(subnode = selector(node));
+        subgroup.push(subnode = selector.call(node, node.__data__, i));
         if (subnode && "__data__" in node) subnode.__data__ = node.__data__;
       } else {
         subgroup.push(null);
@@ -1259,8 +1241,8 @@ d3_selectionPrototype.select = function(selector) {
 };
 
 function d3_selection_selector(selector) {
-  return function(node) {
-    return d3_select(selector, node);
+  return function() {
+    return d3_select(selector, this);
   };
 }
 d3_selectionPrototype.selectAll = function(selector) {
@@ -1273,7 +1255,7 @@ d3_selectionPrototype.selectAll = function(selector) {
   for (var j = -1, m = this.length; ++j < m;) {
     for (var group = this[j], i = -1, n = group.length; ++i < n;) {
       if (node = group[i]) {
-        subgroups.push(subgroup = selector(node));
+        subgroups.push(subgroup = selector.call(node, node.__data__, i));
         subgroup.parentNode = node;
       }
     }
@@ -1283,8 +1265,8 @@ d3_selectionPrototype.selectAll = function(selector) {
 };
 
 function d3_selection_selectorAll(selector) {
-  return function(node) {
-    return d3_selectAll(selector, node);
+  return function() {
+    return d3_selectAll(selector, this);
   };
 }
 d3_selectionPrototype.attr = function(name, value) {
@@ -1443,12 +1425,12 @@ d3_selectionPrototype.html = function(value) {
 d3_selectionPrototype.append = function(name) {
   name = d3.ns.qualify(name);
 
-  function append(node) {
-    return node.appendChild(document.createElement(name));
+  function append() {
+    return this.appendChild(document.createElement(name));
   }
 
-  function appendNS(node) {
-    return node.appendChild(document.createElementNS(name.space, name.local));
+  function appendNS() {
+    return this.appendChild(document.createElementNS(name.space, name.local));
   }
 
   return this.select(name.local ? appendNS : append);
@@ -1459,16 +1441,16 @@ d3_selectionPrototype.append = function(name) {
 d3_selectionPrototype.insert = function(name, before) {
   name = d3.ns.qualify(name);
 
-  function insert(node) {
-    return node.insertBefore(
+  function insert() {
+    return this.insertBefore(
         document.createElement(name),
-        d3_select(before, node));
+        d3_select(before, this));
   }
 
-  function insertNS(node) {
-    return node.insertBefore(
+  function insertNS() {
+    return this.insertBefore(
         document.createElementNS(name.space, name.local),
-        d3_select(before, node));
+        d3_select(before, this));
   }
 
   return this.select(name.local ? insertNS : insert);
@@ -1616,7 +1598,7 @@ d3_selection_enterPrototype.select = function(selector) {
     subgroup.parentNode = group.parentNode;
     for (var i = -1, n = group.length; ++i < n;) {
       if (node = group[i]) {
-        subgroup.push(upgroup[i] = subnode = selector(group.parentNode));
+        subgroup.push(upgroup[i] = subnode = selector.call(group.parentNode, node.__data__, i));
         subnode.__data__ = node.__data__;
       } else {
         subgroup.push(null);
@@ -1865,7 +1847,7 @@ d3_transitionPrototype.select = function(selector) {
   for (var j = -1, m = this.length; ++j < m;) {
     subgroups.push(subgroup = []);
     for (var group = this[j], i = -1, n = group.length; ++i < n;) {
-      if ((node = group[i]) && (subnode = selector(node.node))) {
+      if ((node = group[i]) && (subnode = selector.call(node.node, node.node.__data__, i))) {
         if ("__data__" in node.node) subnode.__data__ = node.node.__data__;
         subgroup.push({node: subnode, delay: node.delay, duration: node.duration});
       } else {
@@ -1886,7 +1868,7 @@ d3_transitionPrototype.selectAll = function(selector) {
   for (var j = -1, m = this.length; ++j < m;) {
     for (var group = this[j], i = -1, n = group.length; ++i < n;) {
       if (node = group[i]) {
-        subgroups.push(subgroup = selector(node.node));
+        subgroups.push(subgroup = selector.call(node.node, node.node.__data__, i));
         for (var k = -1, o = subgroup.length; ++k < o;) {
           subgroup[k] = {node: subgroup[k], delay: node.delay, duration: node.duration};
         }
@@ -3401,7 +3383,7 @@ function d3_svg_mousePoint(container, e) {
 };
 d3.svg.touches = function(container) {
   var touches = d3.event.touches;
-  return touches ? d3_array(touches).map(function(touch) {
+  return touches ? Array.prototype.map.call(touches, function(touch) {
     var point = d3_svg_mousePoint(container, touch);
     point.identifier = touch.identifier;
     return point;

src/core/array.js

@@ -1,21 +1,3 @@
-var d3_array = d3_arraySlice; // conversion for NodeLists
-
-function d3_arrayCopy(pseudoarray) {
-  var i = -1, n = pseudoarray.length, array = [];
-  while (++i < n) array.push(pseudoarray[i]);
-  return array;
-}
-
-function d3_arraySlice(pseudoarray) {
-  return Array.prototype.slice.call(pseudoarray);
-}
-
-try {
-  d3_array(document.documentElement.childNodes)[0].nodeType;
-} catch(e) {
-  d3_array = d3_arrayCopy;
-}
-
 var d3_arraySubclass = [].__proto__?
 
 // Until ECMAScript supports array subclassing, prototype injection works well.

src/core/selectAll.js

@@ -1,5 +1,5 @@
 d3.selectAll = function(selector) {
   return typeof selector === "string"
       ? d3_selectionRoot.selectAll(selector)
-      : d3_selection([d3_array(selector)]); // assume node[]
+      : d3_selection([selector]); // assume node[]
 };

src/core/selection-append.js

@@ -3,12 +3,12 @@
 d3_selectionPrototype.append = function(name) {
   name = d3.ns.qualify(name);
 
-  function append(node) {
-    return node.appendChild(document.createElement(name));
+  function append() {
+    return this.appendChild(document.createElement(name));
   }
 
-  function appendNS(node) {
-    return node.appendChild(document.createElementNS(name.space, name.local));
+  function appendNS() {
+    return this.appendChild(document.createElementNS(name.space, name.local));
   }
 
   return this.select(name.local ? appendNS : append);

src/core/selection-enter-select.js

@@ -12,7 +12,7 @@ d3_selection_enterPrototype.select = function(selector) {
     subgroup.parentNode = group.parentNode;
     for (var i = -1, n = group.length; ++i < n;) {
       if (node = group[i]) {
-        subgroup.push(upgroup[i] = subnode = selector(group.parentNode));
+        subgroup.push(upgroup[i] = subnode = selector.call(group.parentNode, node.__data__, i));
         subnode.__data__ = node.__data__;
       } else {
         subgroup.push(null);

src/core/selection-insert.js

@@ -4,16 +4,16 @@
 d3_selectionPrototype.insert = function(name, before) {
   name = d3.ns.qualify(name);
 
-  function insert(node) {
-    return node.insertBefore(
+  function insert() {
+    return this.insertBefore(
         document.createElement(name),
-        d3_select(before, node));
+        d3_select(before, this));
   }
 
-  function insertNS(node) {
-    return node.insertBefore(
+  function insertNS() {
+    return this.insertBefore(
         document.createElementNS(name.space, name.local),
-        d3_select(before, node));
+        d3_select(before, this));
   }
 
   return this.select(name.local ? insertNS : insert);

src/core/selection-select.js

@@ -12,7 +12,7 @@ d3_selectionPrototype.select = function(selector) {
     subgroup.parentNode = (group = this[j]).parentNode;
     for (var i = -1, n = group.length; ++i < n;) {
       if (node = group[i]) {
-        subgroup.push(subnode = selector(node));
+        subgroup.push(subnode = selector.call(node, node.__data__, i));
         if (subnode && "__data__" in node) subnode.__data__ = node.__data__;
       } else {
         subgroup.push(null);
@@ -24,7 +24,7 @@ d3_selectionPrototype.select = function(selector) {
 };
 
 function d3_selection_selector(selector) {
-  return function(node) {
-    return d3_select(selector, node);
+  return function() {
+    return d3_select(selector, this);
   };
 }

src/core/selection-selectAll.js

@@ -8,7 +8,7 @@ d3_selectionPrototype.selectAll = function(selector) {
   for (var j = -1, m = this.length; ++j < m;) {
     for (var group = this[j], i = -1, n = group.length; ++i < n;) {
       if (node = group[i]) {
-        subgroups.push(subgroup = selector(node));
+        subgroups.push(subgroup = selector.call(node, node.__data__, i));
         subgroup.parentNode = node;
       }
     }
@@ -18,7 +18,7 @@ d3_selectionPrototype.selectAll = function(selector) {
 };
 
 function d3_selection_selectorAll(selector) {
-  return function(node) {
-    return d3_selectAll(selector, node);
+  return function() {
+    return d3_selectAll(selector, this);
   };
 }

src/core/selection.js

@@ -4,7 +4,7 @@ function d3_selection(groups) {
 }
 
 var d3_select = function(s, n) { return n.querySelector(s); },
-    d3_selectAll = function(s, n) { return d3_array(n.querySelectorAll(s)); };
+    d3_selectAll = function(s, n) { return n.querySelectorAll(s); };
 
 // Prefer Sizzle, if available.
 if (typeof Sizzle === "function") {

src/core/transition-select.js

@@ -9,7 +9,7 @@ d3_transitionPrototype.select = function(selector) {
   for (var j = -1, m = this.length; ++j < m;) {
     subgroups.push(subgroup = []);
     for (var group = this[j], i = -1, n = group.length; ++i < n;) {
-      if ((node = group[i]) && (subnode = selector(node.node))) {
+      if ((node = group[i]) && (subnode = selector.call(node.node, node.node.__data__, i))) {
         if ("__data__" in node.node) subnode.__data__ = node.node.__data__;
         subgroup.push({node: subnode, delay: node.delay, duration: node.duration});
       } else {

src/core/transition-selectAll.js

@@ -8,7 +8,7 @@ d3_transitionPrototype.selectAll = function(selector) {
   for (var j = -1, m = this.length; ++j < m;) {
     for (var group = this[j], i = -1, n = group.length; ++i < n;) {
       if (node = group[i]) {
-        subgroups.push(subgroup = selector(node.node));
+        subgroups.push(subgroup = selector.call(node.node, node.node.__data__, i));
         for (var k = -1, o = subgroup.length; ++k < o;) {
           subgroup[k] = {node: subgroup[k], delay: node.delay, duration: node.duration};
         }

src/svg/touches.js

@@ -1,6 +1,6 @@
 d3.svg.touches = function(container) {
   var touches = d3.event.touches;
-  return touches ? d3_array(touches).map(function(touch) {
+  return touches ? Array.prototype.map.call(touches, function(touch) {
     var point = d3_svg_mousePoint(container, touch);
     point.identifier = touch.identifier;
     return point;

test/core/selection-select-test.js

@@ -43,6 +43,16 @@ suite.addBatch({
       assert.equal(span[0][0], null);
       assert.equal(span.length, 1);
       assert.equal(span[0].length, 1);
+    },
+    "can select via function": function(body) {
+      body.append("foo");
+      var d = {}, dd = [], ii = [], tt = [],
+          s = body.data([d]).select(function(d, i) { dd.push(d); ii.push(i); tt.push(this); return this.firstChild; });
+      assert.deepEqual(dd, [d], "expected data, got {actual}");
+      assert.deepEqual(ii, [0], "expected index, got {actual}");
+      assert.domEqual(tt[0], document.body, "expected this, got {actual}");
+      assert.domEqual(s[0][0], document.body.firstChild);
+      delete document.body.__data__;
     }
   }
 });
@@ -98,6 +108,16 @@ suite.addBatch({
       assert.equal(span[0].length, 2);
       assert.isTrue(span[0][0].parentNode === div[0][0]);
       assert.isNull(span[0][1]);
+    },
+    "can select via function": function(div) {
+      var dd = [], ii = [], tt = [],
+          s = div.data(["a", "b"]).select(function(d, i) { dd.push(d); ii.push(i); tt.push(this); return this.firstChild; });
+      assert.deepEqual(dd, ["a", "b"], "expected data, got {actual}");
+      assert.deepEqual(ii, [0, 1], "expected index, got {actual}");
+      assert.domEqual(tt[0], div[0][0], "expected this, got {actual}");
+      assert.domEqual(tt[1], div[0][1], "expected this, got {actual}");
+      assert.domEqual(s[0][0], div[0][0].firstChild);
+      assert.domEqual(s[0][1], div[0][1].firstChild);
     }
   }
 });

test/core/selection-selectAll-test.js

@@ -41,6 +41,16 @@ suite.addBatch({
       var span = body.selectAll("span");
       assert.equal(span.length, 1);
       assert.equal(span[0].length, 0);
+    },
+    "can select via function": function(body) {
+      var d = {}, dd = [], ii = [], tt = [],
+          s = body.data([d]).selectAll(function(d, i) { dd.push(d); ii.push(i); tt.push(this); return this.childNodes; });
+      assert.deepEqual(dd, [d], "expected data, got {actual}");
+      assert.deepEqual(ii, [0], "expected index, got {actual}");
+      assert.domEqual(tt[0], document.body, "expected this, got {actual}");
+      assert.domEqual(s[0][0], document.body.firstChild);
+      assert.domEqual(s[0][1], document.body.lastChild);
+      delete document.body.__data__;
     }
   }
 });
@@ -98,6 +108,18 @@ suite.addBatch({
       assert.equal(span[0].length, 2);
       assert.isTrue(span[0][0].parentNode === div[0][0]);
       assert.isTrue(span[0][1].parentNode === div[0][0]);
+    },
+    "can select via function": function(div) {
+      var dd = [], ii = [], tt = [],
+          s = div.data(["a", "b"]).selectAll(function(d, i) { dd.push(d); ii.push(i); tt.push(this); return this.childNodes; });
+      assert.deepEqual(dd, ["a", "b"], "expected data, got {actual}");
+      assert.deepEqual(ii, [0, 1], "expected index, got {actual}");
+      assert.domEqual(tt[0], div[0][0], "expected this, got {actual}");
+      assert.domEqual(tt[1], div[0][1], "expected this, got {actual}");
+      assert.domEqual(s[0][0], div[0][0].firstChild);
+      assert.domEqual(s[0][1], div[0][0].lastChild);
+      assert.domEqual(s[1][0], div[0][1].firstChild);
+      assert.domEqual(s[1][1], div[0][1].lastChild);
     }
   }
 });