diff --git a/Makefile b/Makefile index 33d3b751..957ab2be 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,7 @@ SRC_FILES = \ src/transform_on.js \ src/transform_filter.js \ src/transform_select.js \ - src/transform_select_all.js \ + src/transform_selectAll.js \ src/transform_style.js \ src/transform_text.js \ src/transform_transition.js \ diff --git a/d3.js b/d3.js index 9e97f780..6a61ed34 100644 --- a/d3.js +++ b/d3.js @@ -751,8 +751,8 @@ function d3_transform() { scope.selectAll = function(s) { var action = { - impl: d3_transform_select_all, - bind: d3_transform_select_all_bind, + impl: d3_transform_selectAll, + bind: d3_transform_selectAll_bind, selector: s, actions: [] }; @@ -802,7 +802,7 @@ function d3_transform() { transform.selectAll = function(s) { var action = { - impl: d3_transform_select_all, + impl: d3_transform_selectAll, selector: s, actions: [] }; @@ -1179,7 +1179,7 @@ d3.selectAll = function(s) { return d3_transform().selectAll(s); }; -function d3_transform_select_all(nodes, pass) { +function d3_transform_selectAll(nodes, pass) { var m = nodes.length, s = this.selector, i, // the node index @@ -1192,11 +1192,11 @@ function d3_transform_select_all(nodes, pass) { d3_transform_stack.shift(); } -function d3_transform_select_all_bind(nodes, pass) { +function d3_transform_selectAll_bind(nodes, pass) { var m = nodes.length, i, // the node index o; // the current node - d3_transform_select_all.call(this, nodes, function(actions, nodes) { + d3_transform_selectAll.call(this, nodes, function(actions, nodes) { pass(actions, nodes.parent.selectAll = nodes); }); this.impl = function(nodes, pass) { diff --git a/src/transform.js b/src/transform.js index 1a1b647e..28263dc5 100644 --- a/src/transform.js +++ b/src/transform.js @@ -144,8 +144,8 @@ function d3_transform() { scope.selectAll = function(s) { var action = { - impl: d3_transform_select_all, - bind: d3_transform_select_all_bind, + impl: d3_transform_selectAll, + bind: d3_transform_selectAll_bind, selector: s, actions: [] }; @@ -195,7 +195,7 @@ function d3_transform() { transform.selectAll = function(s) { var action = { - impl: d3_transform_select_all, + impl: d3_transform_selectAll, selector: s, actions: [] }; diff --git a/src/transform_select_all.js b/src/transform_selectAll.js similarity index 85% rename from src/transform_select_all.js rename to src/transform_selectAll.js index 990a24c5..da713e27 100644 --- a/src/transform_select_all.js +++ b/src/transform_selectAll.js @@ -2,7 +2,7 @@ d3.selectAll = function(s) { return d3_transform().selectAll(s); }; -function d3_transform_select_all(nodes, pass) { +function d3_transform_selectAll(nodes, pass) { var m = nodes.length, s = this.selector, i, // the node index @@ -15,11 +15,11 @@ function d3_transform_select_all(nodes, pass) { d3_transform_stack.shift(); } -function d3_transform_select_all_bind(nodes, pass) { +function d3_transform_selectAll_bind(nodes, pass) { var m = nodes.length, i, // the node index o; // the current node - d3_transform_select_all.call(this, nodes, function(actions, nodes) { + d3_transform_selectAll.call(this, nodes, function(actions, nodes) { pass(actions, nodes.parent.selectAll = nodes); }); this.impl = function(nodes, pass) {