X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=plugins%2Flegend.js;h=f16e6323510dca89f2c3288bfcc9285cd0f3416e;hb=0a14b0f9fbe3e97e0163b4e6ad7893e49d3bf2ff;hp=5f7ac7e9a04c8e30f99dce092043f1e54906b686;hpb=7e4cb2695200ce31626010c2cf0574fc5a83c2a6;p=dygraphs.git

diff --git a/plugins/legend.js b/plugins/legend.js
index 5f7ac7e..f16e632 100644
--- a/plugins/legend.js
+++ b/plugins/legend.js
@@ -5,7 +5,6 @@
  */
 
 Dygraph.Plugins.Legend = (function() {
-
 /*
 
 Current bits of jankiness:
@@ -94,13 +93,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 +118,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);
 }
 
@@ -152,8 +151,10 @@ legend.prototype.predraw = function(e) {
   // TODO(danvk): only use real APIs for this.
   e.dygraph.graphDiv.appendChild(this.legend_div_);
   var area = e.dygraph.plotter_.area;
-  this.legend_div_.style.left = area.x + area.w - e.dygraph.getOption("labelsDivWidth") - 1 + "px";
+  var labelsDivWidth = e.dygraph.getOption("labelsDivWidth");
+  this.legend_div_.style.left = area.x + area.w - labelsDivWidth - 1 + "px";
   this.legend_div_.style.top = area.y + "px";
+  this.legend_div_.style.width = labelsDivWidth + "px";
 };
 
 /**