Skip to content

Commit 1947326

Browse files
committed
v0.6.0 release
1 parent 53c319c commit 1947326

File tree

4 files changed

+52
-58
lines changed

4 files changed

+52
-58
lines changed

dc.js

Lines changed: 21 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1540,43 +1540,40 @@ dc.compositeChart = function(_parent) {
15401540
return _chart;
15411541
};
15421542

1543-
_chart.yAxisMin = function() {
1544-
var min = 0;
1545-
var allGroups = combineAllGroups();
1546-
1547-
for (var i = 0; i < allGroups.length; ++i) {
1548-
var group = allGroups[i];
1549-
var m = d3.min(group.all(), function(e) {
1550-
return _chart.valueRetriever()(e);
1551-
});
1552-
if (m < min) min = m;
1543+
function getAllYAxisMinFromChildCharts() {
1544+
var allMins = [];
1545+
for (var i = 0; i < _children.length; ++i) {
1546+
allMins.push(_children[i].yAxisMin());
15531547
}
1548+
return allMins;
1549+
}
15541550

1555-
return min;
1551+
_chart.yAxisMin = function() {
1552+
return d3.min(getAllYAxisMinFromChildCharts());
15561553
};
15571554

1558-
_chart.yAxisMax = function() {
1559-
var max = 0;
1560-
var allGroups = combineAllGroups();
1561-
1562-
for (var i = 0; i < allGroups.length; ++i) {
1563-
var group = allGroups[i];
1564-
var m = d3.max(group.all(), function(e) {
1565-
return _chart.valueRetriever()(e);
1566-
});
1567-
if(m > max) max = m;
1555+
function getAllYAxisMaxFromChildCharts() {
1556+
var allMaxs = [];
1557+
for (var i = 0; i < _children.length; ++i) {
1558+
allMaxs.push(_children[i].yAxisMax());
15681559
}
1560+
return allMaxs;
1561+
}
15691562

1570-
return max;
1563+
_chart.yAxisMax = function() {
1564+
return d3.max(getAllYAxisMaxFromChildCharts());
15711565
};
15721566

15731567
function combineAllGroups() {
15741568
var allGroups = [];
15751569

15761570
allGroups.push(_chart.group());
15771571

1578-
for (var i = 0; i < _children.length; ++i)
1579-
allGroups.push(_children[i].group());
1572+
for (var i = 0; i < _children.length; ++i) {
1573+
var groups = _children[i].allGroups();
1574+
for (var j = 0; j < groups.length; ++j)
1575+
allGroups.push(groups[j]);
1576+
}
15801577

15811578
return allGroups;
15821579
}

0 commit comments

Comments
 (0)