Mirrors/Chart.js
2
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2026-03-14 20:26:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove innerHTML usage from our DOM platform (#5909)

Browse Source 
Prevent "Unsafe assignment to innerHTML" reported by Firefox when submitting addon to their store.
This commit is contained in:
Simon Brunel
2018-12-14 03:19:42 +01:00
committed by Evert Timberg
parent 69fcba029b
commit f2a9e66b73
1 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -166,9 +166,15 @@ function throttled(fn, thisArg) {
};
}
function createDiv(cls, style) {
var el = document.createElement('div');
el.style.cssText = style || '';
el.className = cls || '';
return el;
}
// Implementation based on https://github.com/marcj/css-element-queries
function createResizer(handler) {
var resizer = document.createElement('div');
var cls = CSS_PREFIX + 'size-monitor';
var maxSize = 1000000;
var style =
@@ -182,37 +188,36 @@ function createResizer(handler) {
'visibility:hidden;' +
'z-index:-1;';
resizer.style.cssText = style;
resizer.className = cls;
resizer.innerHTML =
'<div class="' + cls + '-expand" style="' + style + '">' +
'<div style="' +
'position:absolute;' +
'width:' + maxSize + 'px;' +
'height:' + maxSize + 'px;' +
'left:0;' +
'top:0">' +
'</div>' +
'</div>' +
'<div class="' + cls + '-shrink" style="' + style + '">' +
'<div style="' +
'position:absolute;' +
'width:200%;' +
'height:200%;' +
'left:0; ' +
'top:0">' +
'</div>' +
'</div>';
// NOTE(SB) Don't use innerHTML because it could be considered unsafe.
// https://github.com/chartjs/Chart.js/issues/5902
var resizer = createDiv(cls, style);
var expand = createDiv(cls + '-expand', style);
var shrink = createDiv(cls + '-shrink', style);
var expand = resizer.childNodes[0];
var shrink = resizer.childNodes[1];
expand.appendChild(createDiv('',
'position:absolute;' +
'height:' + maxSize + 'px;' +
'width:' + maxSize + 'px;' +
'left:0;' +
'top:0;'
));
shrink.appendChild(createDiv('',
'position:absolute;' +
'height:200%;' +
'width:200%;' +
'left:0;' +
'top:0;'
));
resizer.appendChild(expand);
resizer.appendChild(shrink);
resizer._reset = function() {
expand.scrollLeft = maxSize;
expand.scrollTop = maxSize;
shrink.scrollLeft = maxSize;
shrink.scrollTop = maxSize;
};
var onScroll = function() {
resizer._reset();
handler();