Merge pull request #192 from kberg/master

[dygraphs.git] / dygraph-options.js

diff --git a/dygraph-options.js b/dygraph-options.js
index e18b726..f059ff9 100644 (file)
--- a/dygraph-options.js
+++ b/dygraph-options.js
@@ -57,20 +57,24 @@ DygraphOptions.AXIS_STRING_MAPPINGS_ = {
   'Y1' : 0,
   'y2' : 1,
   'Y2' : 1
-}
+};
 
 DygraphOptions.axisToIndex_ = function(axis) {
   if (typeof(axis) == "string") {
     if (DygraphOptions.AXIS_STRING_MAPPINGS_.hasOwnProperty(axis)) {
       return DygraphOptions.AXIS_STRING_MAPPINGS_[axis];
     }
-    throw "Unknown axis : " + text;
+    throw "Unknown axis : " + axis;
   }
   if (typeof(axis) == "number") {
-    if (axis == 0 || axis == 1) {
+    if (axis === 0 || axis === 1) {
       return axis;
     }
-    throw "Dygraphs only supports two y-axes, indexed from 0-1."
+    throw "Dygraphs only supports two y-axes, indexed from 0-1.";
+  }
+  if (typeof(axis) == "object") {
+    throw "Using objects for axis specification "
+      + "is not supported inside the 'series' option.";
   }
   if (axis) {
     throw "Unknown axis : " + axis;
@@ -189,14 +193,29 @@ DygraphOptions.prototype.reparseSeries = function() {
  * @param {String} name the name of the option.
  */
 DygraphOptions.prototype.get = function(name) {
+  var result = this.getGlobalUser_(name);
+  if (result != null) {
+    return result;
+  }
+  return this.getGlobalDefault_(name);
+};
+
+DygraphOptions.prototype.getGlobalUser_ = function(name) {
   if (this.user_.hasOwnProperty(name)) {
     return this.user_[name];
   }
+  return null;
+};
+
+DygraphOptions.prototype.getGlobalDefault_ = function(name) {
   if (this.global_.hasOwnProperty(name)) {
     return this.global_[name];
   }
+  if (Dygraph.DEFAULT_ATTRS.hasOwnProperty(name)) {
+    return Dygraph.DEFAULT_ATTRS[name];
+  }
   return null;
-};
+}
 
 /**
  * Get a value for a specific axis. If there is no specific value for the axis,
@@ -214,12 +233,29 @@ DygraphOptions.prototype.getForAxis = function(name, axis) {
     // TODO(konigsberg): Accept only valid axis strings?
     axisIdx = (axis == "y2") ? 1 : 0;
   }
+  // Search the user-specified axis option first.
+  if (this.axes_[axisIdx]) {
+    var axisOptions = this.axes_[axisIdx].options;
+    if (axisOptions.hasOwnProperty(name)) {
+      return axisOptions[name];
+    }
+  }
 
-  var axisOptions = this.axes_[axisIdx].options;
-  if (axisOptions.hasOwnProperty(name)) {
-    return axisOptions[name];
+  // User-specified global options second.
+  var result = this.getGlobalUser_(name);
+  if (result != null) {
+    return result;
   }
-  return this.get(name);
+
+  // Default axis options third.
+  var axisString = axis == 0 ? "y" : "y2";
+  var defaultAxisOptions = Dygraph.DEFAULT_ATTRS.axes[axisString];
+  if (defaultAxisOptions.hasOwnProperty(name)) {
+    return defaultAxisOptions[name];
+  }
+
+  // Default global options last.
+  return this.getGlobalDefault_(name);
 };
 
 /**
@@ -259,35 +295,35 @@ DygraphOptions.prototype.getForSeries = function(name, series) {
  */
 DygraphOptions.prototype.numAxes = function() {
   return this.axes_.length;
-}
+};
 
 /**
  * Return the y-axis for a given series, specified by name.
  */
 DygraphOptions.prototype.axisForSeries = function(seriesName) {
   return this.series_[seriesName].yAxis;
-}
+};
 
 /**
  * Returns the options for the specified axis.
  */
 DygraphOptions.prototype.axisOptions = function(yAxis) {
   return this.axes_[yAxis].options;
-}
+};
 
 /**
  * Return the series associated with an axis.
  */
 DygraphOptions.prototype.seriesForAxis = function(yAxis) {
   return this.axes_[yAxis].series;
-}
+};
 
 /**
  * Return the list of all series, in their columnar order.
  */
 DygraphOptions.prototype.seriesNames = function() {
   return this.labels_;
-}
+};
 
 /* Are we using this? */ 
 /**
@@ -296,4 +332,4 @@ DygraphOptions.prototype.seriesNames = function() {
  */
 DygraphOptions.prototype.indexOfSeries = function(series) {
   return this.series_[series].idx;
-}
+};