From: Dan Vanderkam <danvdk@gmail.com>
Date: Wed, 29 Sep 2010 15:55:35 +0000 (+0200)
Subject: Merge branch 'master' into per_series
X-Git-Tag: v1.0.0~648
X-Git-Url: https://adrianiainlam.tk/git/?a=commitdiff_plain;h=230b34614d5f8e1395e1b142789a40a772642799;hp=450fe64bf99f75ded58bdd34db55fd5fbbe1bb3f;p=dygraphs.git

Merge branch 'master' into per_series
---

diff --git a/dygraph.js b/dygraph.js
index 7dab8c7..517f0c6 100644
--- a/dygraph.js
+++ b/dygraph.js
@@ -1041,7 +1041,7 @@ Dygraph.prototype.updateSelection_ = function() {
     if (this.attr_('showLabelsOnHighlight')) {
       // Set the status message to indicate the selected point(s)
       for (var i = 0; i < this.selPoints_.length; i++) {
-    	if (!this.attr_("labelsShowZeroValues") && this.selPoints_[i].yval == 0) continue;    	  
+        if (!this.attr_("labelsShowZeroValues") && this.selPoints_[i].yval == 0) continue;
         if (!isOK(this.selPoints_[i].canvasy)) continue;
         if (this.attr_("labelsSeparateLines")) {
           replace += "<br/>";
@@ -2152,8 +2152,8 @@ Dygraph.prototype.parseDataTable_ = function(data) {
     var row = [];
     if (typeof(data.getValue(i, 0)) === 'undefined' ||
         data.getValue(i, 0) === null) {
-      this.warning("Ignoring row " + i +
-                   " of DataTable because of undefined or null first column.");
+      this.warn("Ignoring row " + i +
+                " of DataTable because of undefined or null first column.");
       continue;
     }