From 5e918172b2e33d612fc2f80a28716415e3d88366 Mon Sep 17 00:00:00 2001 From: Joe Grund Date: Fri, 27 Dec 2013 13:43:57 -0500 Subject: [PATCH 1/3] Update bower.json Bumped to 1.1.15-beta. --- bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bower.json b/bower.json index ae4cdcb..4046f36 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "nvd3", - "version": "1.1.14-beta", + "version": "1.1.15-beta", "homepage": "http://www.nvd3.org", "authors": [ "Bob Monteverde", From 365863cbe0d832931f17f46d65911d56e806bfde Mon Sep 17 00:00:00 2001 From: Tyler Wolf Date: Mon, 30 Dec 2013 18:05:05 -0500 Subject: [PATCH 2/3] updated d3 version in bower.json --- bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bower.json b/bower.json index d9edee2..cc4be41 100644 --- a/bower.json +++ b/bower.json @@ -18,7 +18,7 @@ ], "license": "Apache License, v2.0", "dependencies": { - "d3": "~3.3.5" + "d3": "~3.3.13" }, "ignore" : [ "**/.*", From 0c03b2794b0a7afe46913cbcefa17e380487dbcf Mon Sep 17 00:00:00 2001 From: Robin Hu Date: Fri, 10 Jan 2014 17:50:16 -0500 Subject: [PATCH 3/3] Updated indexify routine in cumulativeLineChart to fix situation where the index value can be undefined. --- nv.d3.js | 6 +++++- src/models/cumulativeLineChart.js | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/nv.d3.js b/nv.d3.js index 1448aa9..4ddf400 100644 --- a/nv.d3.js +++ b/nv.d3.js @@ -3222,7 +3222,11 @@ nv.models.cumulativeLineChart = function() { if (!line.values) { return line; } - var v = lines.y()(line.values[idx], idx); + var indexValue = line.values[idx]; + if (indexValue == null) { + return line; + } + var v = lines.y()(indexValue, idx); //TODO: implement check below, and disable series if series loses 100% or more cause divide by 0 issue if (v < -.95 && !noErrorCheck) { diff --git a/src/models/cumulativeLineChart.js b/src/models/cumulativeLineChart.js index 9273144..d2de8bb 100644 --- a/src/models/cumulativeLineChart.js +++ b/src/models/cumulativeLineChart.js @@ -740,7 +740,11 @@ nv.models.cumulativeLineChart = function() { if (!line.values) { return line; } - var v = lines.y()(line.values[idx], idx); + var indexValue = line.values[idx]; + if (indexValue == null) { + return line; + } + var v = lines.y()(indexValue, idx); //TODO: implement check below, and disable series if series loses 100% or more cause divide by 0 issue if (v < -.95 && !noErrorCheck) {