JavaScriptCollection
diff --git a/‎d3.js‎
Lines changed: 8 additions & 3 deletions b/‎d3.js‎
Lines changed: 8 additions & 3 deletions
@@ -5082,7 +5082,7 @@
     return vim._tree.ancestor.parent == node.parent ? vim._tree.ancestor : ancestor;
   }
   d3.layout.treemap = function() {
-    var hierarchy = d3.layout.hierarchy(), round = Math.round, size = [ 1, 1 ], padding = null, pad = d3_layout_treemapPadNull, sticky = false, stickies, ratio = .5 * (1 + Math.sqrt(5));
+    var hierarchy = d3.layout.hierarchy(), round = Math.round, size = [ 1, 1 ], padding = null, pad = d3_layout_treemapPadNull, sticky = false, stickies, mode = "squarify", ratio = .5 * (1 + Math.sqrt(5));
     function scale(children, k) {
       var i = -1, n = children.length, child, area;
       while (++i < n) {
@@ -5093,13 +5093,13 @@
     function squarify(node) {
       var children = node.children;
       if (children && children.length) {
-        var rect = pad(node), row = [], remaining = children.slice(), child, best = Infinity, score, u = Math.min(rect.dx, rect.dy), n;
+        var rect = pad(node), row = [], remaining = children.slice(), child, best = Infinity, score, u = mode === "squarify" ? Math.min(rect.dx, rect.dy) : mode === "dice" || mode === "slice-dice" && node.depth & 1 ? rect.dy : rect.dx, n;
         scale(remaining, rect.dx * rect.dy / node.value);
         row.area = 0;
         while ((n = remaining.length) > 0) {
           row.push(child = remaining[n - 1]);
           row.area += child.area;
-          if ((score = worst(row, u)) <= best) {
+          if (mode !== "squarify" || (score = worst(row, u)) <= best) {
             remaining.pop();
             best = score;
           } else {
@@ -5222,6 +5222,11 @@
       ratio = x;
       return treemap;
     };
+    treemap.mode = function(x) {
+      if (!arguments.length) return mode;
+      mode = x + "";
+      return treemap;
+    };
     return d3_layout_hierarchyRebind(treemap, hierarchy);
   };
   function d3_layout_treemapPadNull(node) {