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

Correctly handle decimal display size (#4009)

Browse Source 
Fix the `readUsedSize` regular expression to correctly parse (truncate) pixel decimal values.
This commit is contained in:
Simon Brunel 2017-03-18 11:54:56 +01:00 committed by GitHub
parent 4b421a50bf
commit bd60fa2dfd
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/platforms/platform.dom.js
View File

@ -33,7 +33,7 @@ module.exports = function(Chart) {
*/
function readUsedSize(element, property) {
var value = helpers.getStyle(element, property);
var matches = value && value.match(/(\d+)px/);
var matches = value && value.match(/^(\d+)(\.\d+)?px$/);
return matches? Number(matches[1]) : undefined;
}

18
test/specs/platform.dom.tests.js
View File

@ -226,6 +226,24 @@ describe('Platform.dom', function() {
rw: 165, rh: 85,
});
});
// https://github.com/chartjs/Chart.js/issues/3860
it('should support decimal display width and/or height', function() {
var chart = acquireChart({
options: {
responsive: false
}
}, {
canvas: {
style: 'width: 345.42px; height: 125.42px;'
}
});
expect(chart).toBeChartOfSize({
dw: 345, dh: 125,
rw: 345, rh: 125,
});
});
});
describe('config.options.responsive: true (maintainAspectRatio: true)', function() {