IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Rendering: Have phantomjs wait a bit before rendering to give fonts a change to load (#22623)

Browse Source
This commit is contained in:
Torkel Ödegaard 2020-03-06 17:55:13 +01:00 committed by GitHub
parent 917860c4d3
commit 5a53c2d02b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 70 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tools/phantomjs/render.js
View File

@ -8,11 +8,13 @@
args.forEach(function(arg) {
var parts = arg.match(regexp);
if (!parts) { return; }
if (!parts) {
return;
}
params[parts[1]] = parts[2];
});
var usage = "url=<url> png=<filename> width=<width> height=<height> renderKey=<key>";
var usage = 'url=<url> png=<filename> width=<width> height=<height> renderKey=<key>';
if (!params.url || !params.png || !params.renderKey || !params.domain) {
console.log(usage);
@ -20,21 +22,21 @@
}
phantom.addCookie({
'name': 'renderKey',
'value': params.renderKey,
'domain': params.domain,
name: 'renderKey',
value: params.renderKey,
domain: params.domain,
});
page.viewportSize = {
width: params.width || '800',
height: params.height || '400'
height: params.height || '400',
};
var timeoutMs = (parseInt(params.timeout) || 10) * 1000;
var waitBetweenReadyCheckMs = 50;
var totalWaitMs = 0;
page.open(params.url, function (status) {
page.open(params.url, function(status) {
console.log('Loading a web page: ' + params.url + ' status: ' + status, timeoutMs);
page.onError = function(msg, trace) {
@ -42,7 +44,7 @@
if (trace && trace.length) {
msgStack.push('TRACE:');
trace.forEach(function(t) {
msgStack.push(' -> ' + t.file + ': ' + t.line + (t.function ? ' (in function "' + t.function +'")' : ''));
msgStack.push(' -> ' + t.file + ': ' + t.line + (t.function ? ' (in function "' + t.function + '")' : ''));
});
}
console.error(msgStack.join('\n'));
@ -55,10 +57,10 @@
});
if (panelsRendered || totalWaitMs > timeoutMs) {
var bb = page.evaluate(function () {
var container = document.getElementsByClassName("dashboard-container")
var bb = page.evaluate(function() {
var container = document.getElementsByClassName('dashboard-container');
if (container.length == 0) {
container = document.getElementsByClassName("panel-container")
container = document.getElementsByClassName('panel-container');
}
return container[0].getBoundingClientRect();
});
@ -66,11 +68,13 @@
// reset viewport to render full page
page.viewportSize = {
width: bb.width,
height: bb.height
height: bb.height,
};
setTimeout(function() {
page.render(params.png);
phantom.exit();
}, 5);
} else {
totalWaitMs += waitBetweenReadyCheckMs;
setTimeout(checkIsReady, waitBetweenReadyCheckMs);
@ -79,4 +83,4 @@
setTimeout(checkIsReady, waitBetweenReadyCheckMs);
});
})();
})();