re-apply 1d8de41

reverted in PR #794, needed in PR #798
dc-js · Apr 3, 2015 · 9c1fd8d · 9c1fd8d
1 parent 6174160
commit 9c1fd8d
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 17 deletions.
diff --git a/dc.js b/dc.js
@@ -8011,8 +8011,8 @@ dc.heatMap = function (parent, chartGroup) {
             .on('click', _chart.boxOnClick());
 
         if (_chart.renderTitle()) {
-            gEnter.append('title')
-                .text(_chart.title());
+            gEnter.append('title');
+            boxes.selectAll('title').text(_chart.title());
         }
 
         dc.transition(boxes.selectAll('rect'), _chart.transitionDuration())

diff --git a/dc.min.js b/dc.min.js
diff --git a/dc.min.js.map b/dc.min.js.map
diff --git a/src/heatmap.js b/src/heatmap.js
@@ -199,8 +199,8 @@ dc.heatMap = function (parent, chartGroup) {
             .on('click', _chart.boxOnClick());
 
         if (_chart.renderTitle()) {
-            gEnter.append('title')
-                .text(_chart.title());
+            gEnter.append('title');
+            boxes.selectAll('title').text(_chart.title());
         }
 
         dc.transition(boxes.selectAll('rect'), _chart.transitionDuration())

diff --git a/web/js/dc.js b/web/js/dc.js
@@ -3259,15 +3259,9 @@ dc.stackMixin = function (_chart) {
     };
 
     function flattenStack() {
-        var groups = _chart.data();
-
-        if (groups.length) {
-            groups[0].values = _chart._computeOrderedGroups(groups[0].values);
-        }
-
-        return groups.reduce(function (all, layer) {
-            return all.concat(layer.values);
-        }, []);
+        var valueses = _chart.data().map(function (layer) { return layer.values; });
+        var flattened = Array.prototype.concat.apply([], valueses);
+        return _chart._computeOrderedGroups(flattened);
     }
 
     _chart.xAxisMin = function () {
@@ -8017,8 +8011,8 @@ dc.heatMap = function (parent, chartGroup) {
             .on('click', _chart.boxOnClick());
 
         if (_chart.renderTitle()) {
-            gEnter.append('title')
-                .text(_chart.title());
+            gEnter.append('title');
+            boxes.selectAll('title').text(_chart.title());
         }
 
         dc.transition(boxes.selectAll('rect'), _chart.transitionDuration())