From: Dan Vanderkam <danvdk@gmail.com>
Date: Sun, 23 Nov 2014 18:25:46 +0000 (-0500)
Subject: Merge
X-Git-Tag: v1.1.0~12^2~1
X-Git-Url: https://adrianiainlam.tk/git/?a=commitdiff_plain;h=c17e11738cb5603fafcdc84527114502312344c4;p=dygraphs.git

Merge
---

c17e11738cb5603fafcdc84527114502312344c4
diff --cc plugins/legend.js
index 9a9b9fe,9954682..a5b434c
--- a/plugins/legend.js
+++ b/plugins/legend.js
@@@ -125,7 -128,31 +125,32 @@@ legend.prototype.select = function(e) 
    var xValue = e.selectedX;
    var points = e.selectedPoints;
  
+   if (e.dygraph.getOption("legend") === "follow") {
+     // create floating legend div
+     var area = e.dygraph.plotter_.area;
+     var labelsDivWidth = e.dygraph.getOption("labelsDivWidth");
+     var yAxisLabelWidth = e.dygraph.getOption("yAxisLabelWidth");
+     // determine floating [left, top] coordinates of the legend div
+     // within the plotter_ area
+     // offset 20 px to the left and down from the first selection point
+     // 20 px is guess based on mouse cursor size
+     var leftLegend = points[0].x * area.w + 20;
+     var topLegend  = points[0].y * area.h - 20;
+ 
+     // if legend floats to end of the plotting area, it flips to the other
+     // side of the selection point
+     if ((leftLegend + labelsDivWidth + 1) > (window.scrollX + window.innerWidth)) {
+       leftLegend = leftLegend - 2 * 20 - labelsDivWidth - (yAxisLabelWidth - area.x);
+     }
+ 
+     e.dygraph.graphDiv.appendChild(this.legend_div_);
+     this.legend_div_.style.left = yAxisLabelWidth + leftLegend + "px";
+     this.legend_div_.style.top = topLegend + "px";
+     this.legend_div_.style.display = "block";
+   }
+ 
+   var html = generateLegendHTML(e.dygraph, xValue, points, this.one_em_width_);
 +  var html = legend.generateLegendHTML(e.dygraph, xValue, points, this.one_em_width_);
    this.legend_div_.innerHTML = html;
  };