From 679ad439b0bba03c539c3014155d9f8a852f29c9 Mon Sep 17 00:00:00 2001 From: Dave Landry Date: Mon, 18 Apr 2016 22:00:26 -0400 Subject: [PATCH] fixes line to scatter transition (closes #465) --- src/viz/helpers/drawSteps.js | 2 +- src/viz/types/helpers/graph/includes/axes.coffee | 4 ++-- src/viz/types/helpers/graph/includes/buffer.coffee | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/viz/helpers/drawSteps.js b/src/viz/helpers/drawSteps.js index 11b46933..99120efc 100644 --- a/src/viz/helpers/drawSteps.js +++ b/src/viz/helpers/drawSteps.js @@ -220,7 +220,7 @@ module.exports = function(vars) { //^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ // Groups data by time and nesting. //-------------------------------------------------------------------------- - if (vars.data.changed || vars.time.changed || vars.time.format.changed || vars.id.changed || (vars.x.scale.changed && [vars.x.scale.value, vars.x.scale.previous].indexOf("discrete") >= 0) || (vars.y.scale.changed && [vars.y.scale.value, vars.y.scale.previous].indexOf("discrete") >= 0)) { + if (vars.data.changed || vars.time.changed || vars.time.format.changed || vars.type.changed || vars.id.changed || (vars.x.scale.changed && [vars.x.scale.value, vars.x.scale.previous].indexOf("discrete") >= 0) || (vars.y.scale.changed && [vars.y.scale.value, vars.y.scale.previous].indexOf("discrete") >= 0)) { steps.push({ "function" : dataFormat , "message" : dataMessage }) } diff --git a/src/viz/types/helpers/graph/includes/axes.coffee b/src/viz/types/helpers/graph/includes/axes.coffee index 5e653e87..0f1c002a 100644 --- a/src/viz/types/helpers/graph/includes/axes.coffee +++ b/src/viz/types/helpers/graph/includes/axes.coffee @@ -225,9 +225,9 @@ sizeScale = (vars, value) -> max = max vars if typeof max is "function" if value is false - vars.size.scale.value.rangeRound [max,max] + vars.size.scale.value.domain([0, 1]).rangeRound [max,max] else if typeof value is "number" - vars.size.scale.value.rangeRound [value,value] + vars.size.scale.value.domain([0, 1]).rangeRound [value,value] else if value print.time "calculating buffer scale" if vars.dev.value diff --git a/src/viz/types/helpers/graph/includes/buffer.coffee b/src/viz/types/helpers/graph/includes/buffer.coffee index f8752339..460ea54a 100644 --- a/src/viz/types/helpers/graph/includes/buffer.coffee +++ b/src/viz/types/helpers/graph/includes/buffer.coffee @@ -55,7 +55,7 @@ module.exports = (vars, axis, buffer) -> if domain[0] - additional < domainLow domain[0] = domain[0] - additional - domain[1] = domain[1] + additional + domain[domain.length - 1] = domain[domain.length - 1] + additional else