Fix options reference, so it includes 'Series' category.

[dygraphs.git] / dygraph-options.js

diff --git a/dygraph-options.js b/dygraph-options.js
index 9a4f6bf..7295fb7 100644 (file)
--- a/dygraph-options.js
+++ b/dygraph-options.js
@@ -58,12 +58,36 @@ DygraphOptions.prototype.reparseSeries = function() {
   this.axes_ = [ {} ]; // Always one axis at least.
   this.series_ = {};
 
+  // Traditionally, per-series options were specified right up there with the options. For instance
+  // {
+  //   labels: [ "X", "foo", "bar" ],
+  //   pointSize: 3,
+  //   foo : {}, // options for foo
+  //   bar : {} // options for bar
+  // }
+  //
+  // Moving forward, series really should be specified in the series element, separating them.
+  // like so:
+  //
+  // {
+  //   labels: [ "X", "foo", "bar" ],
+  //   pointSize: 3,
+  //   series : {
+  //     foo : {}, // options for foo
+  //     bar : {} // options for bar
+  //   }
+  // }
+  //
+  // So, if series is found, it's expected to contain per-series data, otherwise we fall
+  // back.
+  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.
   for (var idx = 0; idx < this.labels.length; idx++) {
     var seriesName = this.labels[idx];
 
-    var optionsForSeries = this.user_[seriesName] || {};
+    var optionsForSeries = allseries[seriesName] || {};
     var yAxis = 0;
 
     var axis = optionsForSeries["axis"];
@@ -93,7 +117,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")) {