X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;ds=inline;f=plugins%2Flegend.js;h=9a9b9febb6c3ac0dadcbab979dc02d8d32798f16;hb=refs%2Fheads%2Fjshint;hp=66408b627d97cec64cefba5b4495b5df893420be;hpb=ee60939f4e2238cbb64ebbe7acdc27195c149cfb;p=dygraphs.git
diff --git a/plugins/legend.js b/plugins/legend.js
index 66408b6..9a9b9fe 100644
--- a/plugins/legend.js
+++ b/plugins/legend.js
@@ -7,17 +7,14 @@
Dygraph.Plugins.Legend = (function() {
/*
-
Current bits of jankiness:
- Uses two private APIs:
1. Dygraph.optionsViewForAxis_
2. dygraph.plotter_.area
- Registers for a "predraw" event, which should be renamed.
- I call calculateEmWidthInDiv more often than needed.
-
*/
-/*jshint globalstrict: true */
/*global Dygraph:false */
"use strict";
@@ -38,7 +35,7 @@ legend.prototype.toString = function() {
};
// (defined below)
-var generateLegendHTML, generateLegendDashHTML;
+var generateLegendDashHTML;
/**
* This is called during the dygraph constructor, after options have been set
@@ -88,7 +85,7 @@ legend.prototype.activate = function(g) {
try {
div.style[name] = messagestyle[name];
} catch (e) {
- Dygraph.warn("You are using unsupported css properties for your " +
+ console.warn("You are using unsupported css properties for your " +
"browser in labelsDivStyles");
}
}
@@ -120,11 +117,15 @@ 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;
- 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;
};
@@ -133,7 +134,7 @@ legend.prototype.deselect = function(e) {
var oneEmWidth = calculateEmWidthInDiv(this.legend_div_);
this.one_em_width_ = oneEmWidth;
- var html = generateLegendHTML(e.dygraph, undefined, undefined, oneEmWidth);
+ var html = legend.generateLegendHTML(e.dygraph, undefined, undefined, oneEmWidth);
this.legend_div_.innerHTML = html;
};
@@ -183,7 +184,7 @@ legend.prototype.destroy = function() {
* relevant when displaying a legend with no selection (i.e. {legend:
* 'always'}) and with dashed lines.
*/
-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 '';
@@ -208,7 +209,7 @@ 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;
}
@@ -245,7 +246,7 @@ 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;
};