From dbcd242b09a0e495c5201672610ed4045795fd14 Mon Sep 17 00:00:00 2001 From: Adrian Muraru Date: Wed, 19 Sep 2018 18:43:33 +0300 Subject: [PATCH 1/4] Updated phantomjs render script to take full height screenshots --- tools/phantomjs/render.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/phantomjs/render.js b/tools/phantomjs/render.js index 900660b7ca0..802678fd8da 100644 --- a/tools/phantomjs/render.js +++ b/tools/phantomjs/render.js @@ -56,8 +56,14 @@ if (panelsRendered || totalWaitMs > timeoutMs) { var bb = page.evaluate(function () { - return document.getElementsByClassName("main-view")[0].getBoundingClientRect(); + return document.getElementsByClassName("dashboard-container")[0].getBoundingClientRect(); }); + + // reset viewport to render full page + page.viewportSize = { + width: bb.width, + height: bb.height + }; page.clipRect = { top: bb.top, From ba4d5ddaaafc6c8a72cb6f2f1f09312be10ac9bb Mon Sep 17 00:00:00 2001 From: Adrian Muraru Date: Wed, 19 Sep 2018 19:36:56 +0300 Subject: [PATCH 2/4] Update render.js --- tools/phantomjs/render.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/phantomjs/render.js b/tools/phantomjs/render.js index 802678fd8da..485f6af2d98 100644 --- a/tools/phantomjs/render.js +++ b/tools/phantomjs/render.js @@ -56,7 +56,11 @@ if (panelsRendered || totalWaitMs > timeoutMs) { var bb = page.evaluate(function () { - return document.getElementsByClassName("dashboard-container")[0].getBoundingClientRect(); + var container = document.getElementsByClassName("dashboard-container") + if (container.length == 0) { + container = document.getElementsByClassName("panel-container") + } + return container[0].getBoundingClientRect(); }); // reset viewport to render full page From b7feabdb586b12db16fa4be7b0df675284404fd9 Mon Sep 17 00:00:00 2001 From: Adrian Muraru Date: Sat, 22 Sep 2018 00:49:50 +0300 Subject: [PATCH 3/4] Update render.js --- tools/phantomjs/render.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/phantomjs/render.js b/tools/phantomjs/render.js index 485f6af2d98..9d6dfcfd121 100644 --- a/tools/phantomjs/render.js +++ b/tools/phantomjs/render.js @@ -50,7 +50,7 @@ function checkIsReady() { var panelsRendered = page.evaluate(function() { - var panelCount = document.querySelectorAll('.panel').length; + var panelCount = document.querySelectorAll('plugin-component').length; return window.panelsRendered >= panelCount; }); From bd1f87ed455c9f53fe194ac6a8d159fcdd469b5d Mon Sep 17 00:00:00 2001 From: Adrian Muraru Date: Sat, 22 Sep 2018 00:54:56 +0300 Subject: [PATCH 4/4] Update render.js --- tools/phantomjs/render.js | 7 ------- 1 file changed, 7 deletions(-) diff --git a/tools/phantomjs/render.js b/tools/phantomjs/render.js index 9d6dfcfd121..d0fb0234417 100644 --- a/tools/phantomjs/render.js +++ b/tools/phantomjs/render.js @@ -69,13 +69,6 @@ height: bb.height }; - page.clipRect = { - top: bb.top, - left: bb.left, - width: bb.width, - height: bb.height - }; - page.render(params.png); phantom.exit(); } else {