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

[dygraphs.git] / dygraph-options.js

diff --git a/dygraph-options.js b/dygraph-options.js
index cc8c770..7295fb7 100644 (file)
--- a/dygraph-options.js
+++ b/dygraph-options.js
@@ -11,50 +11,83 @@
  * dygraph_ - the graph.
  * global - global attributes (common among all graphs, AIUI)
  * user - attributes set by the user
- * axes
+ * axes - map of options specific to the axis.
  * series - { seriesName -> { idx, yAxis, options }
  * labels - used as mapping from index to series name.
  */
 
 /**
- * @constructor
- *
  * This parses attributes into an object that can be easily queried.
  *
+ * It doesn't necessarily mean that all options are available, specifically
+ * if labels are not yet available, since those drive details of the per-series
+ * and per-axis options.
+ *
  * @param {Dyraph} dygraph The chart to which these options belong.
+ * @constructor
  */
 var DygraphOptions = function(dygraph) {
   this.dygraph_ = dygraph;
   this.axes_ = [];
   this.series_ = {};
 
-  // Once these two objects are initialized, you can call find();
+  // Once these two objects are initialized, you can call get();
   this.global_ = this.dygraph_.attrs_;
   this.user_ = this.dygraph_.user_attrs_ || {};
 
-  this.highlightSeries_ = this.find("highlightSeriesOpts") || {};
+  this.highlightSeries_ = this.get("highlightSeriesOpts") || {};
   // Get a list of series names.
 
-  var labels = this.find("labels");
+  var labels = this.get("labels");
   if (!labels) {
     return; // -- can't do more for now, will parse after getting the labels.
-  };
+  }
 
   this.reparseSeries();
-}
+};
 
+/**
+ * Reparses options that are all related to series. This typically occurs when
+ * options are either updated, or source data has been made avaialble.
+ *
+ * TODO(konigsberg): The method name is kind of weak; fix.
+ */
 DygraphOptions.prototype.reparseSeries = function() {
-  this.labels = this.find("labels").slice(1);
+  this.labels = this.get("labels").slice(1);
 
   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"];
@@ -84,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")) {
@@ -98,7 +131,12 @@ DygraphOptions.prototype.reparseSeries = function() {
   }
 };
 
-DygraphOptions.prototype.find = function(name) {
+/**
+ * Get a global value.
+ *
+ * @param {String} name the name of the option.
+ */
+DygraphOptions.prototype.get = function(name) {
   if (this.user_.hasOwnProperty(name)) {
     return this.user_[name];
   }
@@ -106,19 +144,41 @@ DygraphOptions.prototype.find = function(name) {
     return this.global_[name];
   }
   return null;
-}
+};
 
-DygraphOptions.prototype.findForAxis = function(name, axis) {
-  var axisIdx = (axis == "y2" || axis == "y2" || axis == 1) ? 1 : 0;
+/**
+ * Get a value for a specific axis. If there is no specific value for the axis,
+ * the global value is returned.
+ *
+ * @param {String} name the name of the option.
+ * @param {String|number} axis the axis to search. Can be the string representation
+ * ("y", "y2") or the axis number (0, 1).
+ */
+DygraphOptions.prototype.getForAxis = function(name, axis) {
+  var axisIdx = 0;
+  if (typeof(axis) == 'number') {
+    axisIdx = axis;
+  } else {
+    // TODO(konigsberg): Accept only valid axis strings?
+    axisIdx = (axis == "y2") ? 1 : 0;
+  }
 
   var axisOptions = this.axes_[axisIdx];
   if (axisOptions.hasOwnProperty(name)) {
     return axisOptions[name];
   }
-  return this.find(name);
-}
+  return this.get(name);
+};
 
-DygraphOptions.prototype.findForSeries = function(name, series) {
+/**
+ * Get a value for a specific series. If there is no specific value for the series,
+ * the value for the axis is returned (and afterwards, the global value.)
+ *
+ * @param {String} name the name of the option.
+ * @param {String|number} series the series to search. Can be the string representation
+ * or 0-offset series number.
+ */
+DygraphOptions.prototype.getForSeries = function(name, series) {
   // Honors indexes as series.
   var seriesName = (typeof(series) == "number") ? this.labels[series] : series;
 
@@ -138,6 +198,6 @@ DygraphOptions.prototype.findForSeries = function(name, series) {
     return seriesOptions[name];
   }
 
-  return this.findForAxis(name, seriesObj["yAxis"]);
-}
+  return this.getForAxis(name, seriesObj["yAxis"]);
+};