only reserve space for y2 axis when it will be drawn

danvk · Apr 30, 2013 · 9f890c2 · 9f890c2
1 parent de25451
commit 9f890c2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/plugins/axes.js b/plugins/axes.js
@@ -71,9 +71,12 @@ axes.prototype.layout = function(e) {
   }
 
   if (g.numAxes() == 2) {
-    // TODO(danvk): per-axis setting.
-    var w = g.getOption('yAxisLabelWidth') + 2 * g.getOption('axisTickSize');
-    e.reserveSpaceRight(w);
+    // TODO(danvk): introduce a 'drawAxis' per-axis property.
+    if (g.getOption('drawYAxis')) {
+      // TODO(danvk): per-axis setting.
+      var w = g.getOption('yAxisLabelWidth') + 2 * g.getOption('axisTickSize');
+      e.reserveSpaceRight(w);
+    }
   } else if (g.numAxes() > 2) {
     g.error("Only two y-axes are supported at this time. (Trying " +
             "to use " + g.numAxes() + ")");

diff --git a/tests/two-axes.html b/tests/two-axes.html
@@ -67,7 +67,7 @@ <h2>Multiple y-axes</h2>
             labels: [ 'Date', 'Y1', 'Y2', 'Y3', 'Y4' ],
             labelsKMB: true,
             ylabel: 'Primary y-axis',
-            y2label: 'Secondary y-axis',
+            y2label: 'Secondary y-axis'
           }
       );