X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=plugins%2Flegend.js;h=85424c6d47a414dc8ffca22f0f5189d541743d7b;hb=5d0ed51c7c3e3325249a88376ac26d192dfabd01;hp=9a7caf9fe15a011217cea9f49dff2433b861a70c;hpb=f5715653807af354fe38f25461c79eae620dae3e;p=dygraphs.git

diff --git a/plugins/legend.js b/plugins/legend.js
index 9a7caf9..85424c6 100644
--- a/plugins/legend.js
+++ b/plugins/legend.js
@@ -94,13 +94,14 @@ legend.prototype.activate = function(g) {
   }
 
   this.legend_div_ = div;
+  this.one_em_width_ = 10;  // just a guess, will be updated.
 
   return {
     select: this.select,
     deselect: this.deselect,
     // TODO(danvk): rethink the name "predraw" before we commit to it in any API.
     predraw: this.predraw,
-    drawChart: this.drawChart
+    didDrawChart: this.didDrawChart
   };
 };
 
@@ -118,21 +119,20 @@ legend.prototype.select = function(e) {
   var xValue = e.selectedX;
   var points = e.selectedPoints;
 
-  // Have to do this every time, since styles might have changed.
-  // TODO(danvk): this is not necessary; dashes never used in this case.
-  var oneEmWidth = calculateEmWidthInDiv(this.legend_div_);
-
-  var html = generateLegendHTML(e.dygraph, xValue, points, oneEmWidth);
+  var html = generateLegendHTML(e.dygraph, xValue, points, this.one_em_width_);
   this.legend_div_.innerHTML = html;
 };
 
 legend.prototype.deselect = function(e) {
+  // Have to do this every time, since styles might have changed.
   var oneEmWidth = calculateEmWidthInDiv(this.legend_div_);
+  this.one_em_width_ = oneEmWidth;
+
   var html = generateLegendHTML(e.dygraph, undefined, undefined, oneEmWidth);
   this.legend_div_.innerHTML = html;
 };
 
-legend.prototype.drawChart = function(e) {
+legend.prototype.didDrawChart = function(e) {
   this.deselect(e);
 }
 
@@ -210,7 +210,7 @@ var generateLegendHTML = function(g, x, sel_points, oneEmWidth) {
   var xOptView = g.optionsViewForAxis_('x');
   var xvf = xOptView('valueFormatter');
   html = xvf(x, xOptView, labels[0], g);
-  if(html) {
+  if(html !== '') {
   	html += ':';
   }