Bmansurov has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/394414 )
Change subject: Hygiene: simplify function signature
......................................................................
Hygiene: simplify function signature
Bundle the format option with pdfOptions.
Change-Id: I8ebc51ac1b28c779e1741ff8176ad064e8576d8b
---
M lib/queue.js
M lib/renderer.js
2 files changed, 8 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/chromium-render
refs/changes/14/394414/1
diff --git a/lib/queue.js b/lib/queue.js
index ca7f03f..be5d42c 100644
--- a/lib/queue.js
+++ b/lib/queue.js
@@ -203,8 +203,12 @@
let renderTime;
data.renderer
- .articleToPdf(data.uri, data.format, this._puppeteerOptions,
- this._pdfOptions)
+ .articleToPdf(
+ data.uri,
+ this._puppeteerOptions,
+ Object.assign(
+ {}, this._pdfOptions, { format: data.format }
+ ))
.then((pdf) => {
renderTime = Date.now() - data._timeAtRenderStart;
this._logger.log(
diff --git a/lib/renderer.js b/lib/renderer.js
index 9b1b24c..dedc90f 100644
--- a/lib/renderer.js
+++ b/lib/renderer.js
@@ -21,13 +21,11 @@
/**
* Renders content from `url` in PDF
* @param {string} url URL to get content from
- * TODO: merge format with pdfOptions
- * @param {string} format Page size, e.g. Letter or A4, passed to
understands
* @param {Object} puppeteerOptions
* @param {Object} pdfOptions
* @return {<Promise<Buffer>>} Promise which resolves with PDF buffer
*/
- articleToPdf(url, format, puppeteerOptions, pdfOptions) {
+ articleToPdf(url, puppeteerOptions, pdfOptions) {
let page;
const that = this;
@@ -41,9 +39,7 @@
return page.goto(url, { waitUntil: 'networkidle2' });
})
.then(() => {
- return page.pdf(Object.assign(
- {}, pdfOptions, { format }
- ));
+ return page.pdf(pdfOptions);
})
.catch((error) => {
// Only thrown an error if we didn't close the browser
ourselves
--
To view, visit https://gerrit.wikimedia.org/r/394414
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ebc51ac1b28c779e1741ff8176ad064e8576d8b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/chromium-render
Gerrit-Branch: master
Gerrit-Owner: Bmansurov <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
