From: Dan Vanderkam <danvdk@gmail.com>
Date: Tue, 29 Jan 2013 21:04:39 +0000 (-0800)
Subject: Merge pull request #200 from kberg/resize-handler
X-Git-Tag: v1.0.0~111
X-Git-Url: https://adrianiainlam.tk/git/?a=commitdiff_plain;h=94efbcad5accd7f314b57fb5c84f0dd86b3cb58b;hp=7d6df48dfebbf5f00c3bf775183280be5db45e75;p=dygraphs.git

Merge pull request #200 from kberg/resize-handler

Resize handler
---

diff --git a/docs/index.html b/docs/index.html
index 97a0d4a..6671696 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -408,6 +408,13 @@ new Dygraph(el, data, {
 
     <p>Most browsers will ignore the trailing comma, but it will break under IE.</p>
 
+    <p>You may also need to delay instantiating any dygraphs until after the DOM
+    content is ready, as there have been some <a
+      href="https://groups.google.com/d/topic/dygraphs-users/qPX4Syx2kz8/discussion">reports</a>
+    that excanvas won't work until this happens. If you're using jQuery, this
+    means drawing your charts inside of a <code>$(function() { ... })</code>
+    block.</p>
+
     <h2 id="gviz">GViz Data</h2>
 
     <p>The <a
diff --git a/dygraph-options.js b/dygraph-options.js
index 78b556b..f287ef1 100644
--- a/dygraph-options.js
+++ b/dygraph-options.js
@@ -199,7 +199,7 @@ DygraphOptions.prototype.reparseSeries = function() {
  */
 DygraphOptions.prototype.get = function(name) {
   var result = this.getGlobalUser_(name);
-  if (result != null) {
+  if (result !== null) {
     return result;
   }
   return this.getGlobalDefault_(name);
@@ -237,7 +237,7 @@ DygraphOptions.prototype.getForAxis = function(name, axis) {
   // Since axis can be a number or a string, straighten everything out here.
   if (typeof(axis) == 'number') {
     axisIdx = axis;
-    axisString = axisIdx == 0 ? "y" : "y2";
+    axisString = axisIdx === 0 ? "y" : "y2";
   } else {
     if (axis == "y1") { axis = "y"; } // Standardize on 'y'. Is this bad? I think so.
     if (axis == "y") {
@@ -264,7 +264,7 @@ DygraphOptions.prototype.getForAxis = function(name, axis) {
 
   // User-specified global options second.
   var result = this.getGlobalUser_(name);
-  if (result != null) {
+  if (result !== null) {
     return result;
   }
 
diff --git a/dygraph.js b/dygraph.js
index 1a523b1..43d3011 100644
--- a/dygraph.js
+++ b/dygraph.js
@@ -2364,9 +2364,7 @@ Dygraph.prototype.drawGraph_ = function() {
 
   if (this.attr_("timingName")) {
     var end = new Date();
-    if (console) {
-      console.log(this.attr_("timingName") + " - drawGraph: " + (end - start) + "ms");
-    }
+    Dygraph.info(this.attr_("timingName") + " - drawGraph: " + (end - start) + "ms");
   }
 };