Commit 6d8eaefa authored by Evgeny's avatar Evgeny

Fix drawing stacked-100 problem

parent 23724104
...@@ -376,39 +376,42 @@ c3_chart_internal_fn.tuneAxis = function(sync, callback){ ...@@ -376,39 +376,42 @@ c3_chart_internal_fn.tuneAxis = function(sync, callback){
$$.pushCallback(callback); $$.pushCallback(callback);
if(!$$.config.stacked){ // if we don't need to tune
if($$.config.stacked){
$$.cachedRedraw();
return;
}
var apply = function(){ var apply = function(){
var minmax = $$.findMinMax(); var minmax = $$.findMinMax();
var sizesX; var sizesX;
if($$.config.is_xy){ if($$.config.is_xy){
sizesX = $$.getAbscissa($$.config.ed3Type, minmax.minX, minmax.maxX); sizesX = $$.getAbscissa($$.config.ed3Type, minmax.minX, minmax.maxX);
}
var sizesY = $$.getAxisData(minmax.minY, minmax.maxY);
$$.api.axis.range({
min: {
x: sizesX ? sizesX.min : undefined,
y: sizesY.min
},
max: {
x: sizesX ? sizesX.max : undefined,
y: sizesY.max
} }
var sizesY = $$.getAxisData(minmax.minY, minmax.maxY); });
$$.api.axis.range({
min: {
x: sizesX ? sizesX.min : undefined,
y: sizesY.min
},
max: {
x: sizesX ? sizesX.max : undefined,
y: sizesY.max
}
});
$$.resolveCallbacks(); $$.resolveCallbacks();
}; };
if(sync){ if(sync){
apply(); apply();
} else { } else {
$$.buffer.onlastfinish("tune-axis", apply); $$.buffer.onlastfinish("tune-axis", apply);
$$.buffer.onlastfinish("cached-redraw", function(){}); $$.buffer.onlastfinish("cached-redraw", function(){});
}
} }
}; };
......
...@@ -32,7 +32,7 @@ c3.chart.internal.fn.cachedRedraw = function(options, callback){ ...@@ -32,7 +32,7 @@ c3.chart.internal.fn.cachedRedraw = function(options, callback){
$$.pushCallback(callback); $$.pushCallback(callback);
if($$.shouldCache){ if($$.config.shouldCache){
if(!$$.buffer.has("tune-axis")){ if(!$$.buffer.has("tune-axis")){
$$.buffer.onlastfinish("cached-redraw", $$.buffer.onlastfinish("cached-redraw",
function(){ function(){
......
...@@ -192,7 +192,9 @@ c3_chart_internal_fn.getDefaultConfig = function () { ...@@ -192,7 +192,9 @@ c3_chart_internal_fn.getDefaultConfig = function () {
}, },
tooltip_init_show: false, tooltip_init_show: false,
tooltip_init_x: 0, tooltip_init_x: 0,
tooltip_init_position: {top: '0px', left: '50px'} tooltip_init_position: {top: '0px', left: '50px'},
// caching
shouldCache: true
}; };
Object.keys(this.additionalConfig).forEach(function (key) { Object.keys(this.additionalConfig).forEach(function (key) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment