X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=plugins%2Flegend.js;h=fb93b419203bc53cac85c4b9eb9490152d44881e;hb=ad7785b8f9a1564b8d18a8ee9a1036936298bb31;hp=f16e6323510dca89f2c3288bfcc9285cd0f3416e;hpb=9127fa5eecec56c37330edd765156a0d28dbc8e9;p=dygraphs.git
diff --git a/plugins/legend.js b/plugins/legend.js
index f16e632..fb93b41 100644
--- a/plugins/legend.js
+++ b/plugins/legend.js
@@ -3,6 +3,7 @@
* Copyright 2012 Dan Vanderkam (danvdk@gmail.com)
* MIT-licensed (http://opensource.org/licenses/MIT)
*/
+/*global Dygraph:false */
Dygraph.Plugins.Legend = (function() {
/*
@@ -16,6 +17,8 @@ Current bits of jankiness:
*/
+/*jshint globalstrict: true */
+/*global Dygraph:false */
"use strict";
@@ -34,6 +37,9 @@ legend.prototype.toString = function() {
return "Legend Plugin";
};
+// (defined below)
+var generateLegendHTML, generateLegendDashHTML;
+
/**
* This is called during the dygraph constructor, after options have been set
* but before the data is available.
@@ -82,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 " +
+ Dygraph.warn("You are using unsupported css properties for your " +
"browser in labelsDivStyles");
}
}
@@ -114,6 +120,10 @@ 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;
@@ -133,7 +143,7 @@ legend.prototype.deselect = 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.
@@ -177,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) {
+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') {
@@ -202,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;
}
@@ -211,8 +221,8 @@ var generateLegendHTML = function(g, x, sel_points, oneEmWidth) {
var xOptView = g.optionsViewForAxis_('x');
var xvf = xOptView('valueFormatter');
html = xvf(x, xOptView, labels[0], g);
- if(html !== '') {
- html += ':';
+ if (html !== '') {
+ html += ':';
}
var yOptViews = [];
@@ -239,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;
};
@@ -256,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 "—";