Merge branch 'master' of github.com:danvk/dygraphs

Conflicts:
	auto_tests/tests/Util.js
	auto_tests/tests/axis_labels.js

diff --git a/auto_tests/tests/Util.js b/auto_tests/tests/Util.js
index 1fce3a0..3eb59e3 100644 (file)
--- a/auto_tests/tests/Util.js
+++ b/auto_tests/tests/Util.js
@@ -79,3 +79,15 @@ Util.assertFontSizes = function(parent, className, expectedSize) {
     assertEquals(expectedSizePx, fontSize);
   }
 };
+
+
+/**
+ * Takes in an array of strings and returns an array of floats.
+ */
+Util.makeNumbers = function(ary) {
+  var ret = [];
+  for (var i = 0; i < ary.length; i++) {
+    ret.push(parseFloat(ary[i]));
+  }
+  return ret;
+};

diff --git a/auto_tests/tests/axis_labels.js b/auto_tests/tests/axis_labels.js
index 00f3913..56ddf3d 100644 (file)
--- a/auto_tests/tests/axis_labels.js
+++ b/auto_tests/tests/axis_labels.js
@@ -14,21 +14,10 @@ AxisLabelsTestCase.prototype.tearDown = function() {
 
 AxisLabelsTestCase.simpleData =
     "X,Y,Y2\n" +
-      "0,-1,0.25\n" +
-      "1,0,0.5\n" +
-      "2,1,0.9\n" +
-      "3,0,0.7\n";
-
-/**
- * Takes in an array of strings and returns an array of floats.
- */
-function makeNumbers(ary) {
-  var ret = [];
-  for (var i = 0; i < ary.length; i++) {
-    ret.push(parseFloat(ary[i]));
-  }
-  return ret;
-}
+    "0,-1,.5\n" +
+    "1,0,.7\n" +
+    "2,1,.4\n" +
+    "3,0,.98\n";
 
 AxisLabelsTestCase.prototype.kCloseFloat = 1.0e-10;
 
@@ -85,18 +74,18 @@ AxisLabelsTestCase.prototype.testSmallRangeNearZero = function() {
 
   var graph = document.getElementById("graph");
   var g = new Dygraph(graph, data, opts);
-  assertEqualsDelta(makeNumbers(["-0.1","-0.08","-0.06","-0.04","-0.02","0","0.02","0.04","0.06","0.08"]),
-                    makeNumbers(Util.getYLabels()), this.kCloseFloat);
+  assertEqualsDelta([-0.1, -0.08, -0.06, -0.04, -0.02, 0, 0.02, 0.04, 0.06, 0.08],
+                    Util.makeNumbers(Util.getYLabels()), this.kCloseFloat);
 
   opts.valueRange = [-0.05, 0.05];
   g.updateOptions(opts);
-  // TODO(danvk): why '1.00e-2' and not '0.01'?
-  assertEquals(makeNumbers(["-0.05","-0.04","-0.03","-0.02","-0.01","0","1.00e-2","0.02","0.03","0.04"]),
-               makeNumbers(Util.getYLabels()));
+  assertEquals([-0.05, -0.04, -0.03, -0.02, -0.01, 0, 0.01, 0.02, 0.03, 0.04],
+               Util.makeNumbers(Util.getYLabels()));
 
   opts.valueRange = [-0.01, 0.01];
   g.updateOptions(opts);
-  assertEquals(makeNumbers(["-0.01","-8.00e-3","-6.00e-3","-4.00e-3","-2.00e-3","0","2.00e-3","4.00e-3","6.00e-3","8.00e-3"]), makeNumbers(Util.getYLabels()));
+  assertEquals([-0.01, -8.00e-3, -6.00e-3, -4.00e-3, -2.00e-3, 0, 2.00e-3, 4.00e-3, 6.00e-3, 8.00e-3],
+               Util.makeNumbers(Util.getYLabels()));
 
   g.setSelection(1);
   assertEquals('1: Y:0', Util.getLegend());
@@ -577,6 +566,77 @@ AxisLabelsTestCase.prototype.testIncludeZero = function() {
   assertEquals(['500','600','700','800','900','1000'], Util.getYLabels());
 }
 
+AxisLabelsTestCase.prototype.testAxisLabelFontSize = function() {
+  var graph = document.getElementById("graph");
+  var g = new Dygraph(graph, AxisLabelsTestCase.simpleData, {});
+  var assertSize = function(className, size) {
+    var sizePx = size + "px";
+    var labels = graph.getElementsByClassName(className);
+    assertTrue(labels.length > 0);
+ 
+    // window.getComputedStyle is apparently compatible with all browsers
+    // (IE first became compatible with IE9.)
+    // If this test fails on earlier browsers, then enable something like this,
+    // because the font size is set by the parent div.
+    // if (!window.getComputedStyle) {
+    //   fontSize = label.parentElement.style.fontSize;
+    // }
+    for (var idx = 0; idx < labels.length; idx++) {
+      var label = labels[idx];
+      var fontSize = window.getComputedStyle(label).fontSize;
+      assertEquals(sizePx, fontSize);
+    }
+  }
+
+  // Be sure we're dealing with a 14-point default.
+  assertEquals(14, Dygraph.DEFAULT_ATTRS.axisLabelFontSize);
+
+  assertSize("dygraph-axis-label-x", 14);
+  assertSize("dygraph-axis-label-y", 14);
+
+  g.updateOptions({ axisLabelFontSize : 8});
+  assertSize("dygraph-axis-label-x", 8);
+  assertSize("dygraph-axis-label-y", 8);
+
+/*
+ Enable these tests when https://code.google.com/p/dygraphs/issues/detail?id=126
+ is fixed.
+
+  g.updateOptions({
+    axisLabelFontSize : null,
+    axes : {
+      x : { axisLabelFontSize : 5 },
+    }
+  });
+
+  assertSize("dygraph-axis-label-x", 5);
+  assertSize("dygraph-axis-label-y", 14);
+
+  g.updateOptions({
+    axisLabelFontSize : null,
+    axes : {
+      y : { axisLabelFontSize : 3 },
+    }
+  });
+
+  assertSize("dygraph-axis-label-x", 5);
+  assertSize("dygraph-axis-label-y", 3);
+
+  g.updateOptions({
+    series : {
+      Y2 : { axis : "y2" } // copy y2 series to y2 axis.
+    },
+    axes : {
+      y2 : { axisLabelFontSize : 8 },
+    }
+  });
+
+  assertSize("dygraph-axis-label-x", 5);
+  assertSize("dygraph-axis-label-y", 3);
+  assertSize("dygraph-axis-label-y2", 8);
+*/
+}
+
 AxisLabelsTestCase.prototype.testAxisLabelFontSizeNull = function() {
   var graph = document.getElementById("graph");
   var g = new Dygraph(graph, AxisLabelsTestCase.simpleData,

diff --git a/dygraph.js b/dygraph.js
index 2bccd60..1ac7d43 100644 (file)
--- a/dygraph.js
+++ b/dygraph.js
@@ -2452,23 +2452,13 @@ Dygraph.prototype.computeYAxes_ = function() {
     this.axes_[axis] = opts;
   }
 
-  // TODO(konigsberg): REMOVE THIS SILLINESS this should just come from DygraphOptions.
-  // TODO(konigsberg): Add tests for all of these.
-
-  // all options which could be applied per-axis:
-  var axisOptions = [
-    'valueRange',
-    'pixelsPerYLabel',
-    'axisLabelFontSize',
-  ];
-
-  // Copy global axis options over to the first axis.
-  for (i = 0; i < axisOptions.length; i++) {
-    var k = axisOptions[i];
-    v = this.attr_(k);
-    if (v) this.axes_[0][k] = v;
-  }
-  // TODO(konigsberg): end of REMOVE THIS SILLINESS
+
+  // Copy global valueRange option over to the first axis.
+  // NOTE(konigsberg): Are these two statements necessary?
+  // I tried removing it. The automated tests pass, and manually
+  // messing with tests/zoom.html showed no trouble.
+  v = this.attr_('valueRange');
+  if (v) this.axes_[0].valueRange = v;
 
   if (valueWindows !== undefined) {
     // Restore valueWindow settings.