switch to deep-copying in updateOptions and add some tests

diff --git a/auto_tests/misc/local.html b/auto_tests/misc/local.html
index 677ce89..7685851 100644 (file)
--- a/auto_tests/misc/local.html
+++ b/auto_tests/misc/local.html
@@ -29,6 +29,7 @@
   <script type="text/javascript" src="../tests/css.js"></script>
   <script type="text/javascript" src="../tests/selection.js"></script>
   <script type="text/javascript" src="../tests/update_options.js"></script>
+  <script type="text/javascript" src="../tests/utils_test.js"></script>
 
 
   <script type="text/javascript">

diff --git a/auto_tests/tests/axis_labels.js b/auto_tests/tests/axis_labels.js
index 2bfcc3b..a04eff4 100644 (file)
--- a/auto_tests/tests/axis_labels.js
+++ b/auto_tests/tests/axis_labels.js
@@ -352,9 +352,7 @@ AxisLabelsTestCase.prototype.testAxisLabelFormatterIncremental = function () {
     }
   });
 
-  // unclear why this is the existing behavior:
-  //assertEquals(["0","1","2","3","4","5","6","7","8"], getXLabels());
-  assertEquals(["0","2","4","6","8"], getXLabels());
+  assertEquals(["x0","x2","x4","x6","x8"], getXLabels());
   //assertEquals(['0','2','4','6','8','10','12','14','16','18'], getYLabels());
 
   //assertEquals(["y0","y1","y2","y3","y4","y5","y6","y7","y8"], getXLabels());
@@ -362,6 +360,6 @@ AxisLabelsTestCase.prototype.testAxisLabelFormatterIncremental = function () {
   assertEquals(['y0','y2','y4','y6','y8','y10','y12','y14','y16','y18'], getYLabels());
 
   g.setSelection(9);
-  //assertEquals("xvf9: y:yvf18", getLegend());
-  assertEquals("9: y:18", getLegend());
+  assertEquals("xvf9: y:yvf18", getLegend());
+  // assertEquals("9: y:18", getLegend());
 };

diff --git a/auto_tests/tests/range_tests.js b/auto_tests/tests/range_tests.js
index 32c511e..7621c9d 100644 (file)
--- a/auto_tests/tests/range_tests.js
+++ b/auto_tests/tests/range_tests.js
@@ -71,7 +71,9 @@ RangeTestCase.prototype.testRangeSetOperations = function() {
   assertEquals([12, 18], g.xAxisRange());
   assertEquals([10, 40], g.yAxisRange(0));
 
+  console.log(g.user_attrs_);
   g.updateOptions({ dateWindow : null, valueRange : null });
+  console.log(g.user_attrs_);
   assertEquals([10, 20], g.xAxisRange());
   assertEquals([0, 55], g.yAxisRange(0));
 };

diff --git a/auto_tests/tests/utils_test.js b/auto_tests/tests/utils_test.js
new file mode 100644 (file)
index 0000000..791ff21
--- /dev/null
+++ b/auto_tests/tests/utils_test.js
@@ -0,0 +1,57 @@
+/** 
+ * @fileoverview Tests for stand-alone functions in dygraph-utils.js
+ *
+ * @author danvdk@gmail.com (Dan Vanderkam)
+ */
+
+var UtilsTestCase = TestCase("utils-tests");
+
+UtilsTestCase.prototype.testUpdate = function() {
+  var a = {
+    a: 1,
+    b: [1, 2, 3],
+    c: { x: 1, y: 2},
+    d: { f: 10, g: 20}
+  };
+  assertEquals(1, a['a']);
+  assertEquals([1, 2, 3], a['b']);
+  assertEquals({x: 1, y: 2}, a['c']);
+  assertEquals({f: 10, g: 20}, a['d']);
+
+  Dygraph.update(a, { c: { x: 2 } });
+  assertEquals({x: 2}, a['c']);
+
+  Dygraph.update(a, { d: null });
+  assertEquals(null, a['d']);
+
+  Dygraph.update(a, { a: 10, b: [1, 2] });
+  assertEquals(10, a['a']);
+  assertEquals([1, 2], a['b']);
+  assertEquals({x: 2}, a['c']);
+  assertEquals(null, a['d']);
+};
+
+UtilsTestCase.prototype.testUpdateDeep = function() {
+  var a = {
+    a: 1,
+    b: [1, 2, 3],
+    c: { x: 1, y: 2},
+    d: { f: 10, g: 20}
+  };
+  assertEquals(1, a['a']);
+  assertEquals([1, 2, 3], a['b']);
+  assertEquals({x: 1, y: 2}, a['c']);
+  assertEquals({f: 10, g: 20}, a['d']);
+
+  Dygraph.updateDeep(a, { c: { x: 2 } });
+  assertEquals({x: 2, y: 2}, a['c']);
+
+  Dygraph.updateDeep(a, { d: null });
+  assertEquals(null, a['d']);
+
+  Dygraph.updateDeep(a, { a: 10, b: [1, 2] });
+  assertEquals(10, a['a']);
+  assertEquals([1, 2], a['b']);
+  assertEquals({x: 2, y: 2}, a['c']);
+  assertEquals(null, a['d']);
+};

diff --git a/dygraph-utils.js b/dygraph-utils.js
index 7d8bf14..0aa307d 100644 (file)
--- a/dygraph-utils.js
+++ b/dygraph-utils.js
@@ -495,6 +495,30 @@ Dygraph.update = function (self, o) {
 };
 
 /**
+ * Copies all the properties from o to self.
+ *
+ * @private
+ */
+Dygraph.updateDeep = function (self, o) {
+  if (typeof(o) != 'undefined' && o !== null) {
+    for (var k in o) {
+      if (o.hasOwnProperty(k)) {
+        if (o[k] == null) {
+          self[k] = null;
+        } else if (typeof(self[k]) == 'object' &&
+                   typeof(o[k]) == 'object' &&
+                   !Dygraph.isArrayLike(o[k])) {
+          Dygraph.updateDeep(self[k], o[k]);
+        } else {
+          self[k] = o[k];
+        }
+      }
+    }
+  }
+  return self;
+};
+
+/**
  * @private
  */
 Dygraph.isArrayLike = function (o) {

diff --git a/dygraph.js b/dygraph.js
index ad7daf9..7768a31 100644 (file)
--- a/dygraph.js
+++ b/dygraph.js
@@ -2671,7 +2671,7 @@ Dygraph.prototype.updateOptions = function(input_attrs, block_redraw) {
   // Check if this set options will require new points.
   var requiresNewPoints = Dygraph.isPixelChangingOptionList(this.attr_("labels"), attrs);
 
-  Dygraph.update(this.user_attrs_, attrs);
+  Dygraph.updateDeep(this.user_attrs_, attrs);
 
   if (attrs['file']) {
     this.file_ = attrs['file'];