Skip to content

Commit 9f96939

Browse files
committed
Merge branch 'fix-classed-whitespace' into 2.9.5
2 parents cc359a9 + 4142e43 commit 9f96939

4 files changed

Lines changed: 8 additions & 12 deletions

File tree

d3.v2.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ function d3_splitter(d) {
449449
return d == null;
450450
}
451451
function d3_collapse(s) {
452-
return s.replace(/(^\s+)|(\s+$)/g, "").replace(/\s+/g, " ");
452+
return s.replace(/^\s+|\s+$/g, "").replace(/\s+/g, " ");
453453
}
454454
d3.range = function(start, stop, step) {
455455
if (arguments.length < 3) {
@@ -1626,7 +1626,7 @@ d3_selectionPrototype.attr = function(name, value) {
16261626
: (name.local ? attrConstantNS : attrConstant)));
16271627
};
16281628
d3_selectionPrototype.classed = function(name, value) {
1629-
var names = name.split(d3_selection_classedWhitespace),
1629+
var names = d3_collapse(name).split(" "),
16301630
n = names.length,
16311631
i = -1;
16321632
if (arguments.length > 1) {
@@ -1638,8 +1638,6 @@ d3_selectionPrototype.classed = function(name, value) {
16381638
}
16391639
};
16401640

1641-
var d3_selection_classedWhitespace = /\s+/g;
1642-
16431641
function d3_selection_classed(name, value) {
16441642
var re = new RegExp("(^|\\s+)" + d3.requote(name) + "(\\s+|$)", "g");
16451643

d3.v2.min.js

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/core/collapse.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
function d3_collapse(s) {
2-
return s.replace(/(^\s+)|(\s+$)/g, "").replace(/\s+/g, " ");
2+
return s.replace(/^\s+|\s+$/g, "").replace(/\s+/g, " ");
33
}

src/core/selection-classed.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
d3_selectionPrototype.classed = function(name, value) {
2-
var names = name.split(d3_selection_classedWhitespace),
2+
var names = d3_collapse(name).split(" "),
33
n = names.length,
44
i = -1;
55
if (arguments.length > 1) {
@@ -11,8 +11,6 @@ d3_selectionPrototype.classed = function(name, value) {
1111
}
1212
};
1313

14-
var d3_selection_classedWhitespace = /\s+/g;
15-
1614
function d3_selection_classed(name, value) {
1715
var re = new RegExp("(^|\\s+)" + d3.requote(name) + "(\\s+|$)", "g");
1816

0 commit comments

Comments
 (0)