CallbackTestCase.prototype.tearDown = function() {
};
-
- var data = "X,a\,b,c\n" +
+
+var data = "X,a\,b,c\n" +
"10,-1,1,2\n" +
"11,0,3,1\n" +
"12,1,4,2\n" +
"13,0,2,3\n";
-
-
- /**
- * This tests that when the function idxToRow_ returns the proper row and the onHiglightCallback
- * is properly called when the first series is hidden (setVisibility = false)
- *
- */
- CallbackTestCase.prototype.testHighlightCallbackIsCalled = function() {
- var h_row;
- var h_pts;
-
- var highlightCallback = function(e, x, pts, row) {
- h_row = row;
- h_pts = pts;
- };
-
-
-
- var graph = document.getElementById("graph");
- var g = new Dygraph(graph, data,
- {
- width: 100,
- height : 100,
- visibility: [false, true, true],
- highlightCallback : highlightCallback
- });
-
- DygraphOps.dispatchMouseMove(g, 13, 10);
-
- //check correct row is returned
- assertEquals(3, h_row);
- //check there are only two points (because first series is hidden)
- assertEquals(2, h_pts.length);
- };
+
+/**
+ * This tests that when the function idxToRow_ returns the proper row and the onHiglightCallback
+ * is properly called when the first series is hidden (setVisibility = false)
+ *
+ */
+CallbackTestCase.prototype.testHighlightCallbackIsCalled = function() {
+ var h_row;
+ var h_pts;
+
+ var highlightCallback = function(e, x, pts, row) {
+ h_row = row;
+ h_pts = pts;
+ };
+
+ var graph = document.getElementById("graph");
+ var g = new Dygraph(graph, data,
+ {
+ width: 100,
+ height: 100,
+ visibility: [false, true, true],
+ highlightCallback: highlightCallback
+ });
+
+ DygraphOps.dispatchMouseMove(g, 13, 10);
+
+ //check correct row is returned
+ assertEquals(3, h_row);
+ //check there are only two points (because first series is hidden)
+ assertEquals(2, h_pts.length);
+};
+
+/**
+ * Test the closest-series highlighting methods for normal and stacked modes.
+ * Also pass in line widths for plain and highlighted lines for easier visual
+ * confirmation that the highlighted line is drawn on top of the others.
+ */
var runClosestTest = function(isStacked, widthNormal, widthHighlighted) {
var h_row;
var h_pts;
var g = new Dygraph(graph, data,
{
width: 600,
- height : 400,
+ height: 400,
visibility: [false, true, true],
stackedGraph: isStacked,
strokeWidth: widthNormal,
"type": "number",
"description": "When nonzero, dim the background while highlighting series. 0=fully visible, 1=hidden"
},
- "highlightSeriesAnimated": {
+ "highlightSeriesAnimate": {
"default": "false",
"labels": ["Interactive Elements"],
- "type": "Object",
+ "type": "boolean",
"description": "Animate the background dimming for nonzero highlightSeriesBackgroundFade."
},
"includeZero": {
"strokeWidth": {
"default": "1.0",
"labels": ["Data Line display"],
- "type": "integer",
+ "type": "float",
"example": "0.5, 2.0",
"description": "The width of the lines connecting data points. This can be used to increase the contrast or some graphs."
},
"strokeBorderWidth": {
"default": "null",
"labels": ["Data Line display"],
- "type": "integer",
- "example": "0.5, 2.0",
+ "type": "float",
+ "example": "1.0",
"description": "Draw a border around graph lines to make crossing lines more easily distinguishable. Useful for graphs with many lines."
},
"strokeBorderColor": {
var sources = [];
sources.push(this.attrs_);
- if (this.user_attrs_) sources.push(this.user_attrs_);
- if (this.user_attrs_ && seriesName) {
- if (this.user_attrs_.hasOwnProperty(seriesName)) {
- sources.push(this.user_attrs_[seriesName]);
- }
- if (seriesName === this.highlightSet_ &&
- this.user_attrs_.hasOwnProperty('highlightSeriesOpts')) {
- sources.push(this.user_attrs_['highlightSeriesOpts']);
+ if (this.user_attrs_) {
+ sources.push(this.user_attrs_);
+ if (seriesName) {
+ if (this.user_attrs_.hasOwnProperty(seriesName)) {
+ sources.push(this.user_attrs_[seriesName]);
+ }
+ if (seriesName === this.highlightSet_ &&
+ this.user_attrs_.hasOwnProperty('highlightSeriesOpts')) {
+ sources.push(this.user_attrs_['highlightSeriesOpts']);
+ }
}
}
var thisId = ++this.animateId;
var that = this;
- Dygraph.repeatAndCleanup(function(n) {
- // ignore simultaneous animations
- if (that.animateId != thisId) return;
-
- that.fadeLevel += direction;
- if (that.fadeLevel === 0) {
- that.clearSelection();
- } else {
- that.updateSelection_(that.fadeLevel / totalSteps);
- }
- },
- steps, millis, function() {});
+ Dygraph.repeatAndCleanup(
+ function(n) {
+ // ignore simultaneous animations
+ if (that.animateId != thisId) return;
+
+ that.fadeLevel += direction;
+ if (that.fadeLevel === 0) {
+ that.clearSelection();
+ } else {
+ that.updateSelection_(that.fadeLevel / totalSteps);
+ }
+ },
+ steps, millis, function() {});
};
/**