Skip to content

Commit

Permalink
Rebase, address review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
kurkle committed May 21, 2019
1 parent 92b0476 commit c293b2b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/controllers/controller.bar.js
Expand Up @@ -328,7 +328,7 @@ module.exports = DatasetController.extend({
}

if (imeta.stack === stack) {
stackLength = scale._parseValue(datasets[i].data[index]);
stackLength = scale._parseValue(datasets[imeta.index].data[index]);
ivalue = stackLength.start === undefined ? stackLength.end : stackLength.min >= 0 && stackLength.max >= 0 ? stackLength.max : stackLength.min;

if ((value.min < 0 && ivalue < 0) || (value.max >= 0 && ivalue > 0)) {
Expand Down
10 changes: 5 additions & 5 deletions src/scales/scale.linear.js
Expand Up @@ -23,11 +23,11 @@ function getMatchingVisibleMetas(scale) {
});
}

function getStack(stacks, stacked, meta) {
function getOrCreateStack(stacks, stacked, meta) {
var key = [
meta.type,
// we have a separate stack for stack=undefined datasets when the opts.stacked is undefined
((stacked === undefined && meta.stack === undefined) ? meta.index : ''),
stacked === undefined && meta.stack === undefined ? meta.index : '',
meta.stack
].join('.');

Expand All @@ -44,14 +44,14 @@ function getStack(stacks, stacked, meta) {
function stackData(scale, stacks, meta, data) {
var opts = scale.options;
var stacked = opts.stacked;
var stack = getStack(stacks, stacked, meta);
var stack = getOrCreateStack(stacks, stacked, meta);
var pos = stack.pos;
var neg = stack.neg;
var ilen = data.length;
var i, value;

for (i = 0; i < ilen; ++i) {
value = this._parseValue(data[i]);
value = scale._parseValue(data[i]);
if (isNaN(value.min) || isNaN(value.max) || meta.data[i].hidden) {
continue;
}
Expand All @@ -74,7 +74,7 @@ function updateMinMax(scale, meta, data) {
var i, value;

for (i = 0; i < ilen; ++i) {
value = this._parseValue(data[i]);
value = scale._parseValue(data[i]);

if (isNaN(value.min) || isNaN(value.max) || meta.data[i].hidden) {
continue;
Expand Down

0 comments on commit c293b2b

Please sign in to comment.