From: Robert Konigsberg <konigsberg@google.com>
Date: Thu, 22 Nov 2012 19:02:31 +0000 (-0500)
Subject: Be friendlier with options that exist, but are null, which is typical when updating... 
X-Git-Tag: v1.0.0~157^2~9
X-Git-Url: https://adrianiainlam.tk/git/?a=commitdiff_plain;h=d89973c0db331c81b4b8019d59fd0aefc5e90871;p=dygraphs.git

Be friendlier with options that exist, but are null, which is typical when updating options.
---

diff --git a/dygraph-options.js b/dygraph-options.js
index 569d5c8..b1cff41 100644
--- a/dygraph-options.js
+++ b/dygraph-options.js
@@ -71,7 +71,7 @@ DygraphOptions.prototype.reparseSeries = function() {
   //
   // So, if series is found, it's expected to contain per-series data, otherwise we fall
   // back.
-  var allseries = this.user_.hasOwnProperty("series") ? this.user_.series : this.user_;
+  var allseries = this.user_["series"] ? this.user_.series : this.user_;
 
   var axisId = 0; // 0-offset; there's always one.
   // Go through once, add all the series, and for those with {} axis options, add a new axis.
@@ -108,7 +108,7 @@ DygraphOptions.prototype.reparseSeries = function() {
 
   // This doesn't support reading from the 'x' axis, only 'y' and 'y2.
   // Read from the global "axes" option.
-  if (this.user_.hasOwnProperty("axes")) {
+  if (this.user_["axes"]) {
     var axis_opts = this.user_.axes;
 
     if (axis_opts.hasOwnProperty("y")) {