Skip to content

Commit

Permalink
fixes line to scatter transition (closes #465)
Browse files Browse the repository at this point in the history
  • Loading branch information
davelandry committed Apr 19, 2016
1 parent 7ab5715 commit 679ad43
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/viz/helpers/drawSteps.js
Expand Up @@ -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 })
}

Expand Down
4 changes: 2 additions & 2 deletions src/viz/types/helpers/graph/includes/axes.coffee
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/viz/types/helpers/graph/includes/buffer.coffee
Expand Up @@ -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

Expand Down

0 comments on commit 679ad43

Please sign in to comment.