merge in kberg changes

[dygraphs.git] / auto_tests / tests / range_tests.js

diff --git a/auto_tests/tests/range_tests.js b/auto_tests/tests/range_tests.js
index 608c05e..32c511e 100644 (file)
--- a/auto_tests/tests/range_tests.js
+++ b/auto_tests/tests/range_tests.js
@@ -84,8 +84,7 @@ RangeTestCase.prototype.zoom = function(g, xRange, yRange) {
   var originalXRange = g.xAxisRange();
   var originalYRange = g.yAxisRange(0);
 
-  // Editing e.shiftKey post construction doesn't work for Firefox. Damn.
-  DygraphOps.dispatchMouseDown(g, xRange[0], yRange[0], function(e) { e.shiftKey = true; });
+  DygraphOps.dispatchMouseDown(g, xRange[0], yRange[0]);
   DygraphOps.dispatchMouseMove(g, xRange[1], yRange[0]); // this is really necessary.
   DygraphOps.dispatchMouseUp(g, xRange[1], yRange[0]);
 
@@ -93,7 +92,7 @@ RangeTestCase.prototype.zoom = function(g, xRange, yRange) {
   // assertEqualsDelta(originalYRange, g.yAxisRange(0), 0.2); // Not true, it's something in the middle.
 
   var midX = (xRange[1] - xRange[0]) / 2;
-  DygraphOps.dispatchMouseDown(g, midX, yRange[0], function(e) { e.shiftKey = true; });
+  DygraphOps.dispatchMouseDown(g, midX, yRange[0]);
   DygraphOps.dispatchMouseMove(g, midX, yRange[1]); // this is really necessary.
   DygraphOps.dispatchMouseUp(g, midX, yRange[1]);
 
@@ -110,6 +109,9 @@ RangeTestCase.prototype.testEmptyUpdateOptions_doesntUnzoom = function() {
   var g = this.createGraph();
   this.zoom(g, [ 11, 18 ], [ 35, 40 ]);
 
+  assertEqualsDelta([11, 18], g.xAxisRange(), 0.1);
+  assertEqualsDelta([35, 40], g.yAxisRange(0), 0.2);
+
   g.updateOptions({});
 
   assertEqualsDelta([11, 18], g.xAxisRange(), 0.1);