archive-gh-me/Chart.js
1
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2025-12-08 20:36:08 +00:00
Code Issues Projects Releases Wiki Activity

Better responsive sizing

Browse Source
This commit is contained in:
Tanner Linsley 2015-06-16 13:06:34 -06:00
parent 088b4fcc55
commit 63530ba66d
5 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Chart.js vendored
View File

@ -71,6 +71,7 @@
Chart.defaults = {
global: {
responsive: true,
responsiveAnimationDuration: 0,
maintainAspectRatio: true,
events: ["mousemove", "mouseout", "click", "touchstart", "touchmove", "touchend"],
hover: {
@ -83,6 +84,7 @@
// Element defaults defined in element extensions
elements: {}
},
};
@ -1092,7 +1094,7 @@
dropFrames: 0,
addAnimation: function(chartInstance, animationObject, duration) {
if (!duration) {
if (typeof duration !== 'number' || duration === 0) {
chartInstance.animating = true;
}
@ -1633,10 +1635,10 @@
// Cascade the resize event down to the chart.
if (instance.options.responsive) {
instance.resize();
instance.update();
instance.update(Chart.defaults.global.responsiveAnimationDuration);
}
});
}, 50);
}, 16);
};
})());

4
Chart.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
src/core/core.animation.js
View File

@ -29,7 +29,7 @@
dropFrames: 0,
addAnimation: function(chartInstance, animationObject, duration) {
if (!duration) {
if (typeof duration !== 'number' || duration === 0) {
chartInstance.animating = true;
}

2
src/core/core.js
View File

@ -71,6 +71,7 @@
Chart.defaults = {
global: {
responsive: true,
responsiveAnimationDuration: 0,
maintainAspectRatio: true,
events: ["mousemove", "mouseout", "click", "touchstart", "touchmove", "touchend"],
hover: {
@ -83,6 +84,7 @@
// Element defaults defined in element extensions
elements: {}
},
};

4
src/core/core.responsive.js
View File

@ -20,10 +20,10 @@
// Cascade the resize event down to the chart.
if (instance.options.responsive) {
instance.resize();
instance.update();
instance.update(Chart.defaults.global.responsiveAnimationDuration);
}
});
}, 50);
}, 16);
};
})());