X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=dygraph.js;h=1861fb611c337574ae82f18b300a2d2ad75354a3;hb=003f94b51b9ff4f8a52935105dfba0aec2b5fd77;hp=dcc555ce9482a7fd06b4232007c00ccf30d7e166;hpb=4b4d1a63e7e4723419f540bf8265c609783bc0fd;p=dygraphs.git diff --git a/dygraph.js b/dygraph.js index dcc555c..1861fb6 100644 --- a/dygraph.js +++ b/dygraph.js @@ -235,22 +235,16 @@ Dygraph.prototype.__init__ = function(div, file, attrs) { if (div.style.height == '' && attrs.height) { div.style.height = attrs.height + "px"; } - if (div.offsetHeight == 0) { + if (div.style.height == '' && div.offsetHeight == 0) { div.style.height = Dygraph.DEFAULT_HEIGHT + "px"; if (div.style.width == '') { div.style.width = Dygraph.DEFAULT_WIDTH + "px"; } } + // these will be zero if the dygraph's div is hidden. this.width_ = div.offsetWidth; this.height_ = div.offsetHeight; - if (this.width_ == 0) { - this.error("dygraph has zero width. Please specify a width in pixels."); - } - if (this.height_ == 0) { - this.error("dygraph has zero height. Please specify a height in pixels."); - } - // TODO(danvk): set fillGraph to be part of attrs_ here, not user_attrs_. if (attrs['stackedGraph']) { attrs['fillGraph'] = true; @@ -783,6 +777,7 @@ Dygraph.prototype.createStatusMessage_ = function() { "overflow": "hidden"}; Dygraph.update(messagestyle, this.attr_('labelsDivStyles')); var div = document.createElement("div"); + div.className = "dygraph-legend"; for (var name in messagestyle) { if (messagestyle.hasOwnProperty(name)) { div.style[name] = messagestyle[name]; @@ -1667,7 +1662,8 @@ Dygraph.dateTicker = function(startDate, endDate, self) { if (chosen >= 0) { return self.GetXAxis(startDate, endDate, chosen); } else { - // TODO(danvk): signal error. + // this can happen if self.width_ is zero. + return []; } };