Skip to content

Commit 98e7d4b

Browse files
mbostockmbostock
committed
Merge remote-tracking branch 'origin/slice' into 3.4.12
2 parents 3bbcd57 + 519f258 commit 98e7d4b

14 files changed

Lines changed: 80 additions & 80 deletions

File tree

‎d3.js‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@
272272
size: d3_map_size,
273273
empty: d3_map_empty,
274274
forEach: function(f) {
275-
for (var key in this) if (key.charCodeAt(0) === d3_map_prefixCode) f.call(this, key.substring(1), this[key]);
275+
for (var key in this) if (key.charCodeAt(0) === d3_map_prefixCode) f.call(this, key.slice(1), this[key]);
276276
}
277277
});
278278
var d3_map_prefix = "\x00", d3_map_prefixCode = d3_map_prefix.charCodeAt(0);
@@ -382,7 +382,7 @@
382382
size: d3_map_size,
383383
empty: d3_map_empty,
384384
forEach: function(f) {
385-
for (var value in this) if (value.charCodeAt(0) === d3_map_prefixCode) f.call(this, value.substring(1));
385+
for (var value in this) if (value.charCodeAt(0) === d3_map_prefixCode) f.call(this, value.slice(1));
386386
}
387387
});
388388
d3.behavior = {};
@@ -399,7 +399,7 @@
399399
}
400400
function d3_vendorSymbol(object, name) {
401401
if (name in object) return name;
402-
name = name.charAt(0).toUpperCase() + name.substring(1);
402+
name = name.charAt(0).toUpperCase() + name.slice(1);
403403
for (var i = 0, n = d3_vendorPrefixes.length; i < n; ++i) {
404404
var prefixName = d3_vendorPrefixes[i] + name;
405405
if (prefixName in object) return prefixName;
@@ -416,8 +416,8 @@
416416
d3_dispatch.prototype.on = function(type, listener) {
417417
var i = type.indexOf("."), name = "";
418418
if (i >= 0) {
419-
name = type.substring(i + 1);
420-
type = type.substring(0, i);
419+
name = type.slice(i + 1);
420+
type = type.slice(0, i);
421421
}
422422
if (type) return arguments.length < 2 ? this[type].on(name) : this[type].on(name, listener);
423423
if (arguments.length === 2) {
@@ -558,8 +558,8 @@
558558
qualify: function(name) {
559559
var i = name.indexOf(":"), prefix = name;
560560
if (i >= 0) {
561-
prefix = name.substring(0, i);
562-
name = name.substring(i + 1);
561+
prefix = name.slice(0, i);
562+
name = name.slice(i + 1);
563563
}
564564
return d3_nsPrefix.hasOwnProperty(prefix) ? {
565565
space: d3_nsPrefix[prefix],
@@ -1008,7 +1008,7 @@
10081008
};
10091009
function d3_selection_on(type, listener, capture) {
10101010
var name = "__on" + type, i = type.indexOf("."), wrap = d3_selection_onListener;
1011-
if (i > 0) type = type.substring(0, i);
1011+
if (i > 0) type = type.slice(0, i);
10121012
var filter = d3_selection_onFilters.get(type);
10131013
if (filter) type = filter, wrap = d3_selection_onFilter;
10141014
function onRemove() {
@@ -1623,7 +1623,7 @@
16231623
}
16241624
}
16251625
if (color = d3_rgb_names.get(format)) return rgb(color.r, color.g, color.b);
1626-
if (format != null && format.charAt(0) === "#" && !isNaN(color = parseInt(format.substring(1), 16))) {
1626+
if (format != null && format.charAt(0) === "#" && !isNaN(color = parseInt(format.slice(1), 16))) {
16271627
if (format.length === 4) {
16281628
r = (color & 3840) >> 4;
16291629
r = r >> 4 | r;
@@ -1970,17 +1970,17 @@
19701970
} else if (c === 10) {
19711971
eol = true;
19721972
}
1973-
return text.substring(j + 1, i).replace(/""/g, '"');
1973+
return text.slice(j + 1, i).replace(/""/g, '"');
19741974
}
19751975
while (I < N) {
19761976
var c = text.charCodeAt(I++), k = 1;
19771977
if (c === 10) eol = true; else if (c === 13) {
19781978
eol = true;
19791979
if (text.charCodeAt(I) === 10) ++I, ++k;
19801980
} else if (c !== delimiterCode) continue;
1981-
return text.substring(j, I - k);
1981+
return text.slice(j, I - k);
19821982
}
1983-
return text.substring(j);
1983+
return text.slice(j);
19841984
}
19851985
while ((t = token()) !== EOF) {
19861986
var a = [];
@@ -2121,7 +2121,7 @@
21212121
function d3_locale_numberFormat(locale) {
21222122
var locale_decimal = locale.decimal, locale_thousands = locale.thousands, locale_grouping = locale.grouping, locale_currency = locale.currency, formatGroup = locale_grouping ? function(value) {
21232123
var i = value.length, t = [], j = 0, g = locale_grouping[0];
2124-
while (i > 0 && g > 0) {
2124+
while (g > 0 && i > 0) {
21252125
t.push(value.substring(i -= g, i + g));
21262126
g = locale_grouping[j = (j + 1) % locale_grouping.length];
21272127
}
@@ -2415,14 +2415,14 @@
24152415
var string = [], i = -1, j = 0, c, p, f;
24162416
while (++i < n) {
24172417
if (template.charCodeAt(i) === 37) {
2418-
string.push(template.substring(j, i));
2418+
string.push(template.slice(j, i));
24192419
if ((p = d3_time_formatPads[c = template.charAt(++i)]) != null) c = template.charAt(++i);
24202420
if (f = d3_time_formats[c]) c = f(date, p == null ? c === "e" ? " " : "0" : p);
24212421
string.push(c);
24222422
j = i + 1;
24232423
}
24242424
}
2425-
string.push(template.substring(j, i));
2425+
string.push(template.slice(j, i));
24262426
return string.join("");
24272427
}
24282428
format.parse = function(string) {
@@ -2589,22 +2589,22 @@
25892589
};
25902590
function d3_time_parseWeekdayAbbrev(date, string, i) {
25912591
d3_time_dayAbbrevRe.lastIndex = 0;
2592-
var n = d3_time_dayAbbrevRe.exec(string.substring(i));
2592+
var n = d3_time_dayAbbrevRe.exec(string.slice(i));
25932593
return n ? (date.w = d3_time_dayAbbrevLookup.get(n[0].toLowerCase()), i + n[0].length) : -1;
25942594
}
25952595
function d3_time_parseWeekday(date, string, i) {
25962596
d3_time_dayRe.lastIndex = 0;
2597-
var n = d3_time_dayRe.exec(string.substring(i));
2597+
var n = d3_time_dayRe.exec(string.slice(i));
25982598
return n ? (date.w = d3_time_dayLookup.get(n[0].toLowerCase()), i + n[0].length) : -1;
25992599
}
26002600
function d3_time_parseMonthAbbrev(date, string, i) {
26012601
d3_time_monthAbbrevRe.lastIndex = 0;
2602-
var n = d3_time_monthAbbrevRe.exec(string.substring(i));
2602+
var n = d3_time_monthAbbrevRe.exec(string.slice(i));
26032603
return n ? (date.m = d3_time_monthAbbrevLookup.get(n[0].toLowerCase()), i + n[0].length) : -1;
26042604
}
26052605
function d3_time_parseMonth(date, string, i) {
26062606
d3_time_monthRe.lastIndex = 0;
2607-
var n = d3_time_monthRe.exec(string.substring(i));
2607+
var n = d3_time_monthRe.exec(string.slice(i));
26082608
return n ? (date.m = d3_time_monthLookup.get(n[0].toLowerCase()), i + n[0].length) : -1;
26092609
}
26102610
function d3_time_parseLocaleFull(date, string, i) {
@@ -2617,7 +2617,7 @@
26172617
return d3_time_parse(date, d3_time_formats.X.toString(), string, i);
26182618
}
26192619
function d3_time_parseAmPm(date, string, i) {
2620-
var n = d3_time_periodLookup.get(string.substring(i, i += 2).toLowerCase());
2620+
var n = d3_time_periodLookup.get(string.slice(i, i += 2).toLowerCase());
26212621
return n == null ? -1 : (date.p = n, i);
26222622
}
26232623
return d3_time_format;
@@ -2641,69 +2641,69 @@
26412641
}
26422642
function d3_time_parseWeekdayNumber(date, string, i) {
26432643
d3_time_numberRe.lastIndex = 0;
2644-
var n = d3_time_numberRe.exec(string.substring(i, i + 1));
2644+
var n = d3_time_numberRe.exec(string.slice(i, i + 1));
26452645
return n ? (date.w = +n[0], i + n[0].length) : -1;
26462646
}
26472647
function d3_time_parseWeekNumberSunday(date, string, i) {
26482648
d3_time_numberRe.lastIndex = 0;
2649-
var n = d3_time_numberRe.exec(string.substring(i));
2649+
var n = d3_time_numberRe.exec(string.slice(i));
26502650
return n ? (date.U = +n[0], i + n[0].length) : -1;
26512651
}
26522652
function d3_time_parseWeekNumberMonday(date, string, i) {
26532653
d3_time_numberRe.lastIndex = 0;
2654-
var n = d3_time_numberRe.exec(string.substring(i));
2654+
var n = d3_time_numberRe.exec(string.slice(i));
26552655
return n ? (date.W = +n[0], i + n[0].length) : -1;
26562656
}
26572657
function d3_time_parseFullYear(date, string, i) {
26582658
d3_time_numberRe.lastIndex = 0;
2659-
var n = d3_time_numberRe.exec(string.substring(i, i + 4));
2659+
var n = d3_time_numberRe.exec(string.slice(i, i + 4));
26602660
return n ? (date.y = +n[0], i + n[0].length) : -1;
26612661
}
26622662
function d3_time_parseYear(date, string, i) {
26632663
d3_time_numberRe.lastIndex = 0;
2664-
var n = d3_time_numberRe.exec(string.substring(i, i + 2));
2664+
var n = d3_time_numberRe.exec(string.slice(i, i + 2));
26652665
return n ? (date.y = d3_time_expandYear(+n[0]), i + n[0].length) : -1;
26662666
}
26672667
function d3_time_parseZone(date, string, i) {
2668-
return /^[+-]\d{4}$/.test(string = string.substring(i, i + 5)) ? (date.Z = -string,
2668+
return /^[+-]\d{4}$/.test(string = string.slice(i, i + 5)) ? (date.Z = -string,
26692669
i + 5) : -1;
26702670
}
26712671
function d3_time_expandYear(d) {
26722672
return d + (d > 68 ? 1900 : 2e3);
26732673
}
26742674
function d3_time_parseMonthNumber(date, string, i) {
26752675
d3_time_numberRe.lastIndex = 0;
2676-
var n = d3_time_numberRe.exec(string.substring(i, i + 2));
2676+
var n = d3_time_numberRe.exec(string.slice(i, i + 2));
26772677
return n ? (date.m = n[0] - 1, i + n[0].length) : -1;
26782678
}
26792679
function d3_time_parseDay(date, string, i) {
26802680
d3_time_numberRe.lastIndex = 0;
2681-
var n = d3_time_numberRe.exec(string.substring(i, i + 2));
2681+
var n = d3_time_numberRe.exec(string.slice(i, i + 2));
26822682
return n ? (date.d = +n[0], i + n[0].length) : -1;
26832683
}
26842684
function d3_time_parseDayOfYear(date, string, i) {
26852685
d3_time_numberRe.lastIndex = 0;
2686-
var n = d3_time_numberRe.exec(string.substring(i, i + 3));
2686+
var n = d3_time_numberRe.exec(string.slice(i, i + 3));
26872687
return n ? (date.j = +n[0], i + n[0].length) : -1;
26882688
}
26892689
function d3_time_parseHour24(date, string, i) {
26902690
d3_time_numberRe.lastIndex = 0;
2691-
var n = d3_time_numberRe.exec(string.substring(i, i + 2));
2691+
var n = d3_time_numberRe.exec(string.slice(i, i + 2));
26922692
return n ? (date.H = +n[0], i + n[0].length) : -1;
26932693
}
26942694
function d3_time_parseMinutes(date, string, i) {
26952695
d3_time_numberRe.lastIndex = 0;
2696-
var n = d3_time_numberRe.exec(string.substring(i, i + 2));
2696+
var n = d3_time_numberRe.exec(string.slice(i, i + 2));
26972697
return n ? (date.M = +n[0], i + n[0].length) : -1;
26982698
}
26992699
function d3_time_parseSeconds(date, string, i) {
27002700
d3_time_numberRe.lastIndex = 0;
2701-
var n = d3_time_numberRe.exec(string.substring(i, i + 2));
2701+
var n = d3_time_numberRe.exec(string.slice(i, i + 2));
27022702
return n ? (date.S = +n[0], i + n[0].length) : -1;
27032703
}
27042704
function d3_time_parseMilliseconds(date, string, i) {
27052705
d3_time_numberRe.lastIndex = 0;
2706-
var n = d3_time_numberRe.exec(string.substring(i, i + 3));
2706+
var n = d3_time_numberRe.exec(string.slice(i, i + 3));
27072707
return n ? (date.L = +n[0], i + n[0].length) : -1;
27082708
}
27092709
function d3_time_zone(d) {
@@ -2712,7 +2712,7 @@
27122712
}
27132713
function d3_time_parseLiteralPercent(date, string, i) {
27142714
d3_time_percentRe.lastIndex = 0;
2715-
var n = d3_time_percentRe.exec(string.substring(i, i + 1));
2715+
var n = d3_time_percentRe.exec(string.slice(i, i + 1));
27162716
return n ? i + n[0].length : -1;
27172717
}
27182718
function d3_time_formatMulti(formats) {
@@ -5615,7 +5615,7 @@
56155615
a = a + "", b = b + "";
56165616
while ((am = d3_interpolate_numberA.exec(a)) && (bm = d3_interpolate_numberB.exec(b))) {
56175617
if ((bs = bm.index) > bi) {
5618-
bs = b.substring(bi, bs);
5618+
bs = b.slice(bi, bs);
56195619
if (s[i]) s[i] += bs; else s[++i] = bs;
56205620
}
56215621
if ((am = am[0]) === (bm = bm[0])) {
@@ -5630,7 +5630,7 @@
56305630
bi = d3_interpolate_numberB.lastIndex;
56315631
}
56325632
if (bi < b.length) {
5633-
bs = b.substring(bi);
5633+
bs = b.slice(bi);
56345634
if (s[i]) s[i] += bs; else s[++i] = bs;
56355635
}
56365636
return s.length < 2 ? q[0] ? (b = q[0].x, function(t) {
@@ -5700,7 +5700,7 @@
57005700
}
57015701
});
57025702
d3.ease = function(name) {
5703-
var i = name.indexOf("-"), t = i >= 0 ? name.substring(0, i) : name, m = i >= 0 ? name.substring(i + 1) : "in";
5703+
var i = name.indexOf("-"), t = i >= 0 ? name.slice(0, i) : name, m = i >= 0 ? name.slice(i + 1) : "in";
57045704
t = d3_ease.get(t) || d3_ease_default;
57055705
m = d3_ease_mode.get(m) || d3_identity;
57065706
return d3_ease_clamp(m(t.apply(null, d3_arraySlice.call(arguments, 1))));

‎d3.min.js‎

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

‎src/arrays/map.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ d3_class(d3_Map, {
3232
size: d3_map_size,
3333
empty: d3_map_empty,
3434
forEach: function(f) {
35-
for (var key in this) if (key.charCodeAt(0) === d3_map_prefixCode) f.call(this, key.substring(1), this[key]);
35+
for (var key in this) if (key.charCodeAt(0) === d3_map_prefixCode) f.call(this, key.slice(1), this[key]);
3636
}
3737
});
3838

‎src/arrays/set.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ d3_class(d3_Set, {
2323
size: d3_map_size,
2424
empty: d3_map_empty,
2525
forEach: function(f) {
26-
for (var value in this) if (value.charCodeAt(0) === d3_map_prefixCode) f.call(this, value.substring(1));
26+
for (var value in this) if (value.charCodeAt(0) === d3_map_prefixCode) f.call(this, value.slice(1));
2727
}
2828
});

‎src/color/rgb.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ function d3_rgb_parse(format, rgb, hsl) {
8989
if (color = d3_rgb_names.get(format)) return rgb(color.r, color.g, color.b);
9090

9191
/* Hexadecimal colors: #rgb and #rrggbb. */
92-
if (format != null && format.charAt(0) === "#" && !isNaN(color = parseInt(format.substring(1), 16))) {
92+
if (format != null && format.charAt(0) === "#" && !isNaN(color = parseInt(format.slice(1), 16))) {
9393
if (format.length === 4) {
9494
r = (color & 0xf00) >> 4; r = (r >> 4) | r;
9595
g = (color & 0xf0); g = (g >> 4) | g;

‎src/core/ns.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ d3.ns = {
1212
var i = name.indexOf(":"),
1313
prefix = name;
1414
if (i >= 0) {
15-
prefix = name.substring(0, i);
16-
name = name.substring(i + 1);
15+
prefix = name.slice(0, i);
16+
name = name.slice(i + 1);
1717
}
1818
return d3_nsPrefix.hasOwnProperty(prefix)
1919
? {space: d3_nsPrefix[prefix], local: name}

‎src/core/vendor.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import "document";
22

33
function d3_vendorSymbol(object, name) {
44
if (name in object) return name;
5-
name = name.charAt(0).toUpperCase() + name.substring(1);
5+
name = name.charAt(0).toUpperCase() + name.slice(1);
66
for (var i = 0, n = d3_vendorPrefixes.length; i < n; ++i) {
77
var prefixName = d3_vendorPrefixes[i] + name;
88
if (prefixName in object) return prefixName;

‎src/dsv/dsv.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ d3.dsv = function(delimiter, mimeType) {
7171
} else if (c === 10) {
7272
eol = true;
7373
}
74-
return text.substring(j + 1, i).replace(/""/g, "\"");
74+
return text.slice(j + 1, i).replace(/""/g, "\"");
7575
}
7676

7777
// common case: find next delimiter or newline
@@ -80,11 +80,11 @@ d3.dsv = function(delimiter, mimeType) {
8080
if (c === 10) eol = true; // \n
8181
else if (c === 13) { eol = true; if (text.charCodeAt(I) === 10) ++I, ++k; } // \r|\r\n
8282
else if (c !== delimiterCode) continue;
83-
return text.substring(j, I - k);
83+
return text.slice(j, I - k);
8484
}
8585

8686
// special case: last token before EOF
87-
return text.substring(j);
87+
return text.slice(j);
8888
}
8989

9090
while ((t = token()) !== EOF) {

‎src/event/dispatch.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ d3_dispatch.prototype.on = function(type, listener) {
1616

1717
// Extract optional namespace, e.g., "click.foo"
1818
if (i >= 0) {
19-
name = type.substring(i + 1);
20-
type = type.substring(0, i);
19+
name = type.slice(i + 1);
20+
type = type.slice(0, i);
2121
}
2222

2323
if (type) return arguments.length < 2

‎src/interpolate/ease.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ var d3_ease_mode = d3.map({
2727

2828
d3.ease = function(name) {
2929
var i = name.indexOf("-"),
30-
t = i >= 0 ? name.substring(0, i) : name,
31-
m = i >= 0 ? name.substring(i + 1) : "in";
30+
t = i >= 0 ? name.slice(0, i) : name,
31+
m = i >= 0 ? name.slice(i + 1) : "in";
3232
t = d3_ease.get(t) || d3_ease_default;
3333
m = d3_ease_mode.get(m) || d3_identity;
3434
return d3_ease_clamp(m(t.apply(null, d3_arraySlice.call(arguments, 1))));

0 commit comments

Comments
 (0)