projects
/
dygraphs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Always set milliseconds to zero when computing date tick placement, so that resulting...
[dygraphs.git]
/
dygraph-canvas.js
diff --git
a/dygraph-canvas.js
b/dygraph-canvas.js
index
6e15a58
..
3c1d40c
100644
(file)
--- a/
dygraph-canvas.js
+++ b/
dygraph-canvas.js
@@
-186,6
+186,7
@@
DygraphCanvasRenderer.prototype.render = function() {
ctx.closePath();
ctx.stroke();
}
ctx.closePath();
ctx.stroke();
}
+ ctx.restore();
}
if (this.attr_('drawXGrid')) {
}
if (this.attr_('drawXGrid')) {
@@
-202,6
+203,7
@@
DygraphCanvasRenderer.prototype.render = function() {
ctx.closePath();
ctx.stroke();
}
ctx.closePath();
ctx.stroke();
}
+ ctx.restore();
}
// Do the ordinary rendering, as before
}
// Do the ordinary rendering, as before
@@
-584,7
+586,8
@@
DygraphCanvasRenderer.prototype._renderAnnotations = function() {
var points = this.layout.annotated_points;
for (var i = 0; i < points.length; i++) {
var p = points[i];
var points = this.layout.annotated_points;
for (var i = 0; i < points.length; i++) {
var p = points[i];
- if (p.canvasx < this.area.x || p.canvasx > this.area.x + this.area.w) {
+ if (p.canvasx < this.area.x || p.canvasx > this.area.x + this.area.w ||
+ p.canvasy < this.area.y || p.canvasy > this.area.y + this.area.h) {
continue;
}
continue;
}