Merge branch 'globals' of https://github.com/jasondavies/d3 into 2.9.0
This commit is contained in:
Коммит
e65580968b
|
@ -2162,8 +2162,8 @@ function d3_transition(groups, id, time) {
|
||||||
lock.active = id;
|
lock.active = id;
|
||||||
|
|
||||||
tweens.forEach(function(key, value) {
|
tweens.forEach(function(key, value) {
|
||||||
if (tween = value.call(node, d, i)) {
|
if (value = value.call(node, d, i)) {
|
||||||
tweened.push(tween);
|
tweened.push(value);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -8852,7 +8852,7 @@ function d3_time_parseWeekday(date, string, i) {
|
||||||
}
|
}
|
||||||
|
|
||||||
var d3_time_weekdayAbbrevRe = /^(?:sun|mon|tue|wed|thu|fri|sat)/i,
|
var d3_time_weekdayAbbrevRe = /^(?:sun|mon|tue|wed|thu|fri|sat)/i,
|
||||||
d3_time_weekdayRe = /^(?:Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday)/i;
|
d3_time_weekdayRe = /^(?:Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday)/i,
|
||||||
d3_time_weekdays = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"];
|
d3_time_weekdays = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"];
|
||||||
|
|
||||||
function d3_time_parseMonthAbbrev(date, string, i) {
|
function d3_time_parseMonthAbbrev(date, string, i) {
|
||||||
|
|
Различия файлов скрыты, потому что одна или несколько строк слишком длинны
|
@ -45,8 +45,8 @@ function d3_transition(groups, id, time) {
|
||||||
lock.active = id;
|
lock.active = id;
|
||||||
|
|
||||||
tweens.forEach(function(key, value) {
|
tweens.forEach(function(key, value) {
|
||||||
if (tween = value.call(node, d, i)) {
|
if (value = value.call(node, d, i)) {
|
||||||
tweened.push(tween);
|
tweened.push(value);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -133,7 +133,7 @@ function d3_time_parseWeekday(date, string, i) {
|
||||||
}
|
}
|
||||||
|
|
||||||
var d3_time_weekdayAbbrevRe = /^(?:sun|mon|tue|wed|thu|fri|sat)/i,
|
var d3_time_weekdayAbbrevRe = /^(?:sun|mon|tue|wed|thu|fri|sat)/i,
|
||||||
d3_time_weekdayRe = /^(?:Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday)/i;
|
d3_time_weekdayRe = /^(?:Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday)/i,
|
||||||
d3_time_weekdays = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"];
|
d3_time_weekdays = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"];
|
||||||
|
|
||||||
function d3_time_parseMonthAbbrev(date, string, i) {
|
function d3_time_parseMonthAbbrev(date, string, i) {
|
||||||
|
|
Загрузка…
Ссылка в новой задаче