From: Dan Vanderkam <danvk@google.com>
Date: Wed, 10 Nov 2010 15:40:40 +0000 (-0500)
Subject: Merge branch 'master' of http://github.com/kberg/dygraphs
X-Git-Tag: v1.0.0~613
X-Git-Url: https://adrianiainlam.tk/git/?a=commitdiff_plain;h=c14ca33ea8a4991e6eaece7aae162ac813adfe1f;hp=3a8dc464e8e7b197d7df18220ab2ad189ff95841;p=dygraphs.git

Merge branch 'master' of github.com/kberg/dygraphs
---

diff --git a/dygraph.js b/dygraph.js
index f736a7e..7384e71 100644
--- a/dygraph.js
+++ b/dygraph.js
@@ -189,10 +189,10 @@ Dygraph.prototype.__init__ = function(div, file, attrs) {
   // If the div isn't already sized then inherit from our attrs or
   // give it a default size.
   if (div.style.width == '') {
-    div.style.width = attrs.width || Dygraph.DEFAULT_WIDTH + "px";
+    div.style.width = (attrs.width || Dygraph.DEFAULT_WIDTH) + "px";
   }
   if (div.style.height == '') {
-    div.style.height = attrs.height || Dygraph.DEFAULT_HEIGHT + "px";
+    div.style.height = (attrs.height || Dygraph.DEFAULT_HEIGHT) + "px";
   }
   this.width_ = parseInt(div.style.width, 10);
   this.height_ = parseInt(div.style.height, 10);