Mirrors/Chart.js
2
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2026-03-11 02:36:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix a race condition in the resize listener & use the correct merged config object for the responsive setting

Browse Source
This commit is contained in:
Evert Timberg
2015-10-12 09:16:49 -04:00
parent 81095e777a
commit 1232ca53f0
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/core.js
View File

@@ -58,19 +58,18 @@
Chart.helpers.retinaScale(this);
// Always bind this so that if the responsive state changes we still work
if (config) {
this.controller = new Chart.Controller(this);
}
var _this = this;
Chart.helpers.addResizeListener(context.canvas.parentNode, function() {
if (config.options.responsive) {
if (_this.controller && _this.controller.config.options.responsive) {
_this.controller.resize();
}
});
if (config) {
this.controller = new Chart.Controller(this);
return this.controller;
}
return this;
return this.controller ? this.controller : this;
};