Restore funny format; add comment to indicate why it's formatted funny.

[dygraphs.git] / dygraph-options.js

diff --git a/dygraph-options.js b/dygraph-options.js
index f734c5d..815a893 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;
@@ -157,15 +161,11 @@ DygraphOptions.prototype.reparseSeries = function() {
       }
     }
   } else {
-    var maxYAxis = 0;
-
     for (var idx = 0; idx < this.labels.length; idx++) {
       var seriesName = this.labels[idx];
       var optionsForSeries = this.user_.series[seriesName] || {};
       var yAxis = DygraphOptions.axisToIndex_(optionsForSeries["axis"]);
 
-      maxYAxis = Math.max(yAxis, maxYAxis);
-
       this.series_[seriesName] = {
         idx: idx,
         yAxis: yAxis,
@@ -263,35 +263,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? */ 
 /**
@@ -300,4 +300,4 @@ DygraphOptions.prototype.seriesNames = function() {
  */
 DygraphOptions.prototype.indexOfSeries = function(series) {
   return this.series_[series].idx;
-}
+};