Label styles

From: Dan Vanderkam Date: Sun, 23 Nov 2014 21:18:11 +0000 (-0500) Subject: Merge pull request #491 from danvk/legend-never X-Git-Tag: v1.1.0~11 X-Git-Url: https://adrianiainlam.tk/git/?a=commitdiff_plain;h=406eddbbdea074df010fc3c432185bc78f9a5814;hp=297da0d8f33ab7ba2e6860b20b3c8e722e77720f;p=dygraphs.git Merge pull request #491 from danvk/legend-never Add "legend: never" --- diff --git a/dygraph.js b/dygraph.js index b1af8de..efc9092 100644 --- a/dygraph.js +++ b/dygraph.js @@ -312,8 +312,7 @@ Dygraph.DEFAULT_ATTRS = { stackedGraphNaNFill: 'all', hideOverlayOnMouseOut: true, - // TODO(danvk): support 'onmouseover' and 'never', and remove synonyms. - legend: 'onmouseover', // the only relevant value at the moment is 'always'. + legend: 'onmouseover', stepPlot: false, avoidMinZero: false, xRangePad: 0, diff --git a/plugins/legend.js b/plugins/legend.js index bb86949..65ee671 100644 --- a/plugins/legend.js +++ b/plugins/legend.js @@ -125,7 +125,13 @@ legend.prototype.select = function(e) { var xValue = e.selectedX; var points = e.selectedPoints; - if (e.dygraph.getOption('legend') === 'follow') { + var legendMode = e.dygraph.getOption('legend'); + if (legendMode === 'never') { + this.legend_div_.style.display = 'none'; + return; + } + + if (legendMode === 'follow') { // create floating legend div var area = e.dygraph.plotter_.area; var labelsDivWidth = e.dygraph.getOption('labelsDivWidth'); @@ -146,16 +152,16 @@ legend.prototype.select = function(e) { 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 = ''; } var html = legend.generateLegendHTML(e.dygraph, xValue, points, this.one_em_width_); this.legend_div_.innerHTML = html; + this.legend_div_.style.display = ''; }; legend.prototype.deselect = function(e) { - - if (e.dygraph.getOption("legend") === "follow") { + var legendMode = e.dygraph.getOption('legend'); + if (legendMode !== 'always') { this.legend_div_.style.display = "none"; } diff --git a/tests/customLabelFollow.html b/tests/customLabelFollow.html deleted file mode 100644 index 76d3822..0000000 --- a/tests/customLabelFollow.html +++ /dev/null @@ -1,44 +0,0 @@ - - - - - Label styles - - - - - - - - -

Legend follows highlighted points:

- - - - diff --git a/tests/legend-values.html b/tests/legend-values.html new file mode 100644 index 0000000..b2362a4 --- /dev/null +++ b/tests/legend-values.html @@ -0,0 +1,85 @@ + + + + + Label styles + + + + + + + + +

This page demonstrates different values for the legend option. Mouse over the charts to see the different behaviors.

legend: "follow":

+ +

legend: "always":

+ +

legend: "never":

+ +

legend: "onmouseover" (the default):

+ + + +