X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=plugins%2Flegend.js;h=c88727a8f1b0b1225099293462125bc89c161eea;hb=ac3070f822673ec233bace8dfa407831a6c8d6d7;hp=68a676254ff1a12c6a1d834c06c4f102bfab4024;hpb=117b8bee20ce2bf7d36668af054285244d438b5c;p=dygraphs.git
diff --git a/plugins/legend.js b/plugins/legend.js
index 68a6762..c88727a 100644
--- a/plugins/legend.js
+++ b/plugins/legend.js
@@ -3,9 +3,9 @@
* Copyright 2012 Dan Vanderkam (danvdk@gmail.com)
* MIT-licensed (http://opensource.org/licenses/MIT)
*/
+/*global Dygraph:false */
Dygraph.Plugins.Legend = (function() {
-
/*
Current bits of jankiness:
@@ -17,6 +17,8 @@ Current bits of jankiness:
*/
+/*jshint globalstrict: true */
+/*global Dygraph:false */
"use strict";
@@ -35,6 +37,9 @@ legend.prototype.toString = function() {
return "Legend Plugin";
};
+// (defined below)
+var generateLegendDashHTML;
+
/**
* This is called during the dygraph constructor, after options have been set
* but before the data is available.
@@ -83,7 +88,7 @@ legend.prototype.activate = function(g) {
try {
div.style[name] = messagestyle[name];
} catch (e) {
- this.warn("You are using unsupported css properties for your " +
+ console.warn("You are using unsupported css properties for your " +
"browser in labelsDivStyles");
}
}
@@ -94,13 +99,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
};
};
@@ -114,27 +120,30 @@ var calculateEmWidthInDiv = function(div) {
return oneEmWidth;
};
+var escapeHTML = function(str) {
+ return str.replace(/&/g, "&").replace(/"/g, """).replace(//g, ">");
+};
+
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 = legend.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_);
- var html = generateLegendHTML(e.dygraph, undefined, undefined, oneEmWidth);
+ this.one_em_width_ = oneEmWidth;
+
+ var html = legend.generateLegendHTML(e.dygraph, undefined, undefined, oneEmWidth);
this.legend_div_.innerHTML = html;
};
-legend.prototype.drawChart = function(e) {
+legend.prototype.didDrawChart = function(e) {
this.deselect(e);
-}
+};
// Right edge should be flush with the right edge of the charting area (which
// may not be the same as the right edge of the div, if we have two y-axes.
@@ -150,9 +159,12 @@ legend.prototype.predraw = function(e) {
if (!this.is_generated_div_) return;
// 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";
};
/**
@@ -175,14 +187,14 @@ legend.prototype.destroy = function() {
* relevant when displaying a legend with no selection (i.e. {legend:
* 'always'}) and with dashed lines.
*/
-var generateLegendHTML = function(g, x, sel_points, oneEmWidth) {
+legend.generateLegendHTML = function(g, x, sel_points, oneEmWidth) {
// TODO(danvk): deprecate this option in place of {legend: 'never'}
if (g.getOption('showLabelsOnHighlight') !== true) return '';
// If no points are selected, we display a default legend. Traditionally,
// this has been blank. But a better default would be a conventional legend,
// which provides essential information for a non-interactive chart.
- var html, sepLines, i, c, dash, strokePattern;
+ var html, sepLines, i, dash, strokePattern;
var labels = g.getLabels();
if (typeof(x) === 'undefined') {
@@ -200,7 +212,7 @@ var generateLegendHTML = function(g, x, sel_points, oneEmWidth) {
strokePattern = g.getOption("strokePattern", labels[i]);
dash = generateLegendDashHTML(strokePattern, series.color, oneEmWidth);
html += "" +
- dash + " " + labels[i] + "";
+ dash + " " + escapeHTML(labels[i]) + "";
}
return html;
}
@@ -208,7 +220,10 @@ var generateLegendHTML = function(g, x, sel_points, oneEmWidth) {
// TODO(danvk): remove this use of a private API
var xOptView = g.optionsViewForAxis_('x');
var xvf = xOptView('valueFormatter');
- html = xvf(x, xOptView, labels[0], g) + ":";
+ html = xvf(x, xOptView, labels[0], g);
+ if (html !== '') {
+ html += ':';
+ }
var yOptViews = [];
var num_axes = g.numAxes();
@@ -234,7 +249,7 @@ var generateLegendHTML = function(g, x, sel_points, oneEmWidth) {
// TODO(danvk): use a template string here and make it an attribute.
html += "" + " " +
- pt.name + ":" + yval + "";
+ escapeHTML(pt.name) + ": " + yval + "";
}
return html;
};
@@ -251,7 +266,7 @@ var generateLegendHTML = function(g, x, sel_points, oneEmWidth) {
* @param oneEmWidth The width in pixels of 1em in the legend.
* @private
*/
-var generateLegendDashHTML = function(strokePattern, color, oneEmWidth) {
+generateLegendDashHTML = function(strokePattern, color, oneEmWidth) {
// IE 7,8 fail at these divs, so they get boring legend, have not tested 9.
var isIE = (/MSIE/.test(navigator.userAgent) && !window.opera);
if (isIE) return "—";