From d89973c0db331c81b4b8019d59fd0aefc5e90871 Mon Sep 17 00:00:00 2001 From: Robert Konigsberg Date: Thu, 22 Nov 2012 14:02:31 -0500 Subject: [PATCH] Be friendlier with options that exist, but are null, which is typical when updating options. --- dygraph-options.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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")) { -- 2.7.4