Merge branch 'master' of https://github.com/mhodorogea/dc.js

Conflicts: src/stack-mixin.js
dc-js · Nov 17, 2014 · cbe65ed · cbe65ed
2 parents 2f63c7b + 4bf7e34
commit cbe65ed
Show file tree

Hide file tree

Showing 6 changed files with 72 additions and 59 deletions.
diff --git a/dc.js b/dc.js
@@ -3227,7 +3227,14 @@ dc.stackMixin = function (_chart) {
     };
 
     function flattenStack() {
-        return _chart.data().reduce(function (all, layer) {
+        var groups = _chart.data();
+
+        if(groups.length){
+        groups[0].values = _chart._computeOrderedGroups(groups[0].values);
+        // Order barChart (ordering option) by key or by value increasing or by value decreasing. 
+        }
+
+        return groups.reduce(function (all, layer) {
             return all.concat(layer.values);
         }, []);
     }

diff --git a/dc.min.js b/dc.min.js
diff --git a/dc.min.js.map b/dc.min.js.map