Merge branch 'array-subclass' into release

This commit is contained in:
Mike Bostock 2011-08-26 16:58:15 -07:00
Родитель 522c66a45c 5aeb312196
Коммит 88e1a6c781
7 изменённых файлов: 37 добавлений и 34 удалений

Просмотреть файл

@ -78,8 +78,6 @@ d3.core.js: \
src/core/uninterpolate.js \
src/core/rgb.js \
src/core/hsl.js \
src/core/select.js \
src/core/selectAll.js \
src/core/selection.js \
src/core/selection-select.js \
src/core/selection-selectAll.js \
@ -104,6 +102,7 @@ d3.core.js: \
src/core/selection-empty.js \
src/core/selection-node.js \
src/core/selection-transition.js \
src/core/selection-root.js \
src/core/transition.js \
src/core/transition-select.js \
src/core/transition-selectAll.js \

32
d3.js поставляемый
Просмотреть файл

@ -1183,17 +1183,6 @@ function d3_hsl_rgb(h, s, l) {
return d3_rgb(vv(h + 120), vv(h), vv(h - 120));
}
// TODO fast singleton implementation!
d3.select = function(selector) {
return typeof selector === "string"
? d3_selectionRoot.select(selector)
: d3_selection([[selector]]); // assume node
};
d3.selectAll = function(selector) {
return typeof selector === "string"
? d3_selectionRoot.selectAll(selector)
: d3_selection([selector]); // assume node[]
};
function d3_selection(groups) {
d3_arraySubclass(groups, d3_selectionPrototype);
return groups;
@ -1208,10 +1197,7 @@ if (typeof Sizzle === "function") {
d3_selectAll = function(s, n) { return Sizzle.uniqueSort(Sizzle(s, n)); };
}
var d3_selectionPrototype = [],
d3_selectionRoot = d3_selection([[document]]);
d3_selectionRoot[0].parentNode = document.documentElement;
var d3_selectionPrototype = [];
d3.selection = function() {
return d3_selectionRoot;
@ -1737,6 +1723,22 @@ d3_selectionPrototype.transition = function() {
return d3_transition(subgroups, d3_transitionInheritId || ++d3_transitionId);
};
var d3_selectionRoot = d3_selection([[document]]);
d3_selectionRoot[0].parentNode = document.documentElement;
// TODO fast singleton implementation!
d3.select = function(selector) {
return typeof selector === "string"
? d3_selectionRoot.select(selector)
: d3_selection([[selector]]); // assume node
};
d3.selectAll = function(selector) {
return typeof selector === "string"
? d3_selectionRoot.selectAll(selector)
: d3_selection([selector]); // assume node[]
};
function d3_transition(groups, id) {
d3_arraySubclass(groups, d3_transitionPrototype);

4
d3.min.js поставляемый

Различия файлов скрыты, потому что одна или несколько строк слишком длинны

Просмотреть файл

@ -1,6 +0,0 @@
// TODO fast singleton implementation!
d3.select = function(selector) {
return typeof selector === "string"
? d3_selectionRoot.select(selector)
: d3_selection([[selector]]); // assume node
};

Просмотреть файл

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

Просмотреть файл

@ -0,0 +1,16 @@
var d3_selectionRoot = d3_selection([[document]]);
d3_selectionRoot[0].parentNode = document.documentElement;
// TODO fast singleton implementation!
d3.select = function(selector) {
return typeof selector === "string"
? d3_selectionRoot.select(selector)
: d3_selection([[selector]]); // assume node
};
d3.selectAll = function(selector) {
return typeof selector === "string"
? d3_selectionRoot.selectAll(selector)
: d3_selection([selector]); // assume node[]
};

Просмотреть файл

@ -12,10 +12,7 @@ if (typeof Sizzle === "function") {
d3_selectAll = function(s, n) { return Sizzle.uniqueSort(Sizzle(s, n)); };
}
var d3_selectionPrototype = [],
d3_selectionRoot = d3_selection([[document]]);
d3_selectionRoot[0].parentNode = document.documentElement;
var d3_selectionPrototype = [];
d3.selection = function() {
return d3_selectionRoot;