From: Dan Vanderkam <dan@dygraphs.com>
Date: Mon, 9 May 2011 16:56:13 +0000 (-0400)
Subject: consider whether axes are displayed when computing area
X-Git-Tag: v1.0.0~495
X-Git-Url: https://adrianiainlam.tk/git/?a=commitdiff_plain;h=520c8080121bbc2db67a700f9f1e2d4859a8f6ca;p=dygraphs.git

consider whether axes are displayed when computing area
---

diff --git a/dygraph-canvas.js b/dygraph-canvas.js
index fb454c9..471d9e4 100644
--- a/dygraph-canvas.js
+++ b/dygraph-canvas.js
@@ -334,12 +334,18 @@ DygraphCanvasRenderer.prototype.attr_ = function(x) {
 DygraphCanvasRenderer.prototype.computeArea_ = function() {
   var area = {
     // TODO(danvk): per-axis setting.
-    x: this.attr_('yAxisLabelWidth') + 2 * this.attr_('axisTickSize'),
+    x: 0,
     y: 0
   };
+  if (this.attr_('drawYAxis')) {
+   area.x = this.attr_('yAxisLabelWidth') + 2 * this.attr_('axisTickSize');
+  }
+
   area.w = this.width - area.x - this.attr_('rightGap');
-  area.h = this.height - this.attr_('axisLabelFontSize') -
-                2 * this.attr_('axisTickSize');
+  area.h = this.height;
+  if (this.attr_('drawXAxis')) {
+    area.h -= this.attr_('axisLabelFontSize') + 2 * this.attr_('axisTickSize');
+  }
 
   // Shrink the drawing area to accomodate additional y-axes.
   if (this.dygraph_.numAxes() == 2) {