projects
/
dygraphs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix another 0 vs. null bug
[dygraphs.git]
/
dygraph-canvas.js
diff --git
a/dygraph-canvas.js
b/dygraph-canvas.js
index
58e6917
..
a848001
100644
(file)
--- a/
dygraph-canvas.js
+++ b/
dygraph-canvas.js
@@
-38,6
+38,7
@@
DygraphLayout.prototype.evaluate = function() {
DygraphLayout.prototype._evaluateLimits = function() {
this.minxval = this.maxxval = null;
for (var name in this.datasets) {
DygraphLayout.prototype._evaluateLimits = function() {
this.minxval = this.maxxval = null;
for (var name in this.datasets) {
+ if (!this.datasets.hasOwnProperty(name)) continue;
var series = this.datasets[name];
var x1 = series[0][0];
if (!this.minxval || x1 < this.minxval) this.minxval = x1;
var series = this.datasets[name];
var x1 = series[0][0];
if (!this.minxval || x1 < this.minxval) this.minxval = x1;
@@
-58,6
+59,8
@@
DygraphLayout.prototype._evaluateLineCharts = function() {
// add all the rects
this.points = new Array();
for (var setName in this.datasets) {
// add all the rects
this.points = new Array();
for (var setName in this.datasets) {
+ if (!this.datasets.hasOwnProperty(setName)) continue;
+
var dataset = this.datasets[setName];
for (var j = 0; j < dataset.length; j++) {
var item = dataset[j];
var dataset = this.datasets[setName];
for (var j = 0; j < dataset.length; j++) {
var item = dataset[j];
@@
-117,6
+120,7
@@
DygraphLayout.prototype.evaluateWithError = function() {
// Copy over the error terms
var i = 0; // index in this.points
for (var setName in this.datasets) {
// Copy over the error terms
var i = 0; // index in this.points
for (var setName in this.datasets) {
+ if (!this.datasets.hasOwnProperty(setName)) continue;
var j = 0;
var dataset = this.datasets[setName];
for (var j = 0; j < dataset.length; j++, i++) {
var j = 0;
var dataset = this.datasets[setName];
for (var j = 0; j < dataset.length; j++, i++) {
@@
-322,7
+326,9
@@
DygraphCanvasRenderer.prototype._renderAxis = function() {
var makeDiv = function(txt) {
var div = document.createElement("div");
for (var name in labelStyle) {
var makeDiv = function(txt) {
var div = document.createElement("div");
for (var name in labelStyle) {
- div.style[name] = labelStyle[name];
+ if (labelStyle.hasOwnProperty(name)) {
+ div.style[name] = labelStyle[name];
+ }
}
div.appendChild(document.createTextNode(txt));
return div;
}
div.appendChild(document.createTextNode(txt));
return div;
@@
-334,7
+340,7
@@
DygraphCanvasRenderer.prototype._renderAxis = function() {
context.lineWidth = this.options.axisLineWidth;
if (this.options.drawYAxis) {
context.lineWidth = this.options.axisLineWidth;
if (this.options.drawYAxis) {
- if (this.layout.yticks) {
+ if (this.layout.yticks
&& this.layout.yticks.length > 0
) {
for (var i = 0; i < this.layout.yticks.length; i++) {
var tick = this.layout.yticks[i];
if (typeof(tick) == "function") return;
for (var i = 0; i < this.layout.yticks.length; i++) {
var tick = this.layout.yticks[i];
if (typeof(tick) == "function") return;
@@
-437,7
+443,11
@@
DygraphCanvasRenderer.prototype._renderLineChart = function() {
var errorBars = this.layout.options.errorBars;
var setNames = [];
var errorBars = this.layout.options.errorBars;
var setNames = [];
- for (var name in this.layout.datasets) setNames.push(name);
+ for (var name in this.layout.datasets) {
+ if (this.layout.datasets.hasOwnProperty(name)) {
+ setNames.push(name);
+ }
+ }
var setCount = setNames.length;
//Update Points
var setCount = setNames.length;
//Update Points
@@
-537,7
+547,8
@@
DygraphCanvasRenderer.prototype._renderLineChart = function() {
if (drawPoints || isIsolated) {
ctx.beginPath();
ctx.fillStyle = color;
if (drawPoints || isIsolated) {
ctx.beginPath();
ctx.fillStyle = color;
- ctx.arc(point.canvasx, point.canvasy, pointSize, 0, 360, false);
+ ctx.arc(point.canvasx, point.canvasy, pointSize,
+ 0, 2 * Math.PI, false);
ctx.fill();
}
}
ctx.fill();
}
}