Commit f0652fd0 authored by David Schnur's avatar David Schnur

Merge pull request #910 from dnschnur/pie-resize-fix

Allow the pie chart to redraw on resize or update.
parents 715a0933 d09b2786
...@@ -190,8 +190,6 @@ More detail and specific examples can be found in the included HTML file. ...@@ -190,8 +190,6 @@ More detail and specific examples can be found in the included HTML file.
canvas = plot.getCanvas(); canvas = plot.getCanvas();
target = $(canvas).parent(); target = $(canvas).parent();
options = plot.getOptions(); options = plot.getOptions();
canvasWidth = plot.getPlaceholder().width();
canvasHeight = plot.getPlaceholder().height();
plot.setData(combine(plot.getData())); plot.setData(combine(plot.getData()));
} }
} }
...@@ -293,6 +291,9 @@ More detail and specific examples can be found in the included HTML file. ...@@ -293,6 +291,9 @@ More detail and specific examples can be found in the included HTML file.
return; // if no series were passed return; // if no series were passed
} }
canvasWidth = plot.getPlaceholder().width();
canvasHeight = plot.getPlaceholder().height();
ctx = newCtx; ctx = newCtx;
setupPie(); setupPie();
...@@ -317,6 +318,12 @@ More detail and specific examples can be found in the included HTML file. ...@@ -317,6 +318,12 @@ More detail and specific examples can be found in the included HTML file.
target.prepend("<div class='error'>Could not draw pie with labels contained inside canvas</div>"); target.prepend("<div class='error'>Could not draw pie with labels contained inside canvas</div>");
} }
// Reset the redraw flag on success, so the loop above can run
// again in the event of a resize or other update.
// TODO: We should remove this redraw system entirely!
redraw = true;
if (plot.setSeries && plot.insertLegend) { if (plot.setSeries && plot.insertLegend) {
plot.setSeries(slices); plot.setSeries(slices);
plot.insertLegend(); plot.insertLegend();
......
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