Add tests that break currently, but will pass when http://code.google.com/p/dygraphs...

[dygraphs.git] / dygraph.js

diff --git a/dygraph.js b/dygraph.js
index 1193e74..3612c11 100644 (file)
--- a/dygraph.js
+++ b/dygraph.js
@@ -418,6 +418,9 @@ Dygraph.prototype.__init__ = function(div, file, attrs) {
     attrs.animatedZooms = false;
   }
 
+  // DEPRECATION WARNING: All option processing should be moved from
+  // attrs_ and user_attrs_ to options_, which holds all this information.
+  //
   // Dygraphs has many options, some of which interact with one another.
   // To keep track of everything, we maintain two sets of options:
   //
@@ -2436,40 +2439,12 @@ Dygraph.prototype.computeYAxes_ = function() {
 
   // this.axes_ doesn't match this.attributes_.axes_.options. It's used for
   // data computation as well as options storage.
-  this.axes_ = [];
-  for (axis = 0; axis < this.attributes_.numAxes(); axis++) {
-    this.axes_.push({ yAxisId : i, g : this });
-  }
-
-  // all options which could be applied per-axis:
-  // TODO(konigsberg)
-  var globalAxisOptions = [
-    'includeZero',
-    'valueRange',
-    'labelsKMB',
-    'labelsKMG2',
-    'pixelsPerYLabel',
-    'yAxisLabelWidth',
-    'axisLabelFontSize',
-    'axisTickSize',
-    'logscale'
-  ];
-
-  // Copy global axis options over to the first axis.
-  for (i = 0; i < globalAxisOptions.length; i++) {
-    var k = globalAxisOptions[i];
-    v = this.attr_(k);
-    if (v) this.axes_[0][k] = v;
-  }
-
   // Go through once and add all the axes.
+  this.axes_ = [];
   
-  // This seems to be right - starting at 1. I think this gets simpler now.
-  for (axis = 1; axis < this.attributes_.numAxes(); axis++) {
+  for (axis = 0; axis < this.attributes_.numAxes(); axis++) {
     // Add a new axis, making a copy of its per-axis options.
-    opts = {};
-    Dygraph.update(opts, this.axes_[0]);
-    Dygraph.update(opts, { valueRange: null });  // shouldn't inherit this.
+    opts = { g : this };
     Dygraph.update(opts, this.attributes_.axisOptions(axis));
     this.axes_[axis] = opts;
   }
@@ -2481,7 +2456,6 @@ Dygraph.prototype.computeYAxes_ = function() {
     }
   }
 
-  // New axes options
   for (axis = 0; axis < this.axes_.length; axis++) {
     if (axis === 0) {
       opts = this.optionsViewForAxis_('y' + (axis ? '2' : ''));
@@ -3223,6 +3197,7 @@ Dygraph.prototype.parseDataTable_ = function(data) {
   if (annotations.length > 0) {
     this.setAnnotations(annotations, true);
   }
+  this.attributes_.reparseSeries();
 };
 
 /**
@@ -3357,6 +3332,10 @@ Dygraph.mapLegacyOptions_ = function(attrs) {
   };
   var map = function(opt, axis, new_opt) {
     if (typeof(attrs[opt]) != 'undefined') {
+      Dygraph.warn("Option " + opt + " is deprecated. Use the " +
+          new_opt + " option for the " + axis + " axis instead. " +
+          "(e.g. { axes : { " + axis + " : { " + new_opt + " : ... } } } " +
+          "(see http://dygraphs.com/per-axis.html for more information.");
       set(axis, new_opt, attrs[opt]);
       delete my_attrs[opt];
     }