瀏覽代碼

set default parameter values

Former-commit-id: 7a26d29d934cf3c72d1383d1f4cfbc1f0fdf7e5b
Gildas 6 年之前
父節點
當前提交
226c328478
共有 4 個文件被更改,包括 6 次插入4 次删除
  1. 1 1
      cli/back-ends/puppeteer.js
  2. 1 1
      cli/back-ends/webdriver-chromium.js
  3. 1 1
      cli/back-ends/webdriver-gecko.js
  4. 3 1
      lib/index.js

+ 1 - 1
cli/back-ends/puppeteer.js

@@ -71,7 +71,7 @@ exports.getPageData = async options => {
 		});
 		try {
 			return await page.evaluate(async options => {
-				await singlefile.lib.initializeOptions(options, document, window);
+				options = await singlefile.lib.initializeOptions(options);
 				const pageData = await singlefile.lib.getPageData(options);
 				if (options.includeInfobar) {
 					await singlefile.common.ui.content.infobar.includeScript(pageData);

+ 1 - 1
cli/back-ends/webdriver-chromium.js

@@ -137,7 +137,7 @@ function getPageDataScript() {
 		.catch(error => callback({ error: error.toString() }));
 
 	async function getPageData() {
-		await singlefile.lib.initializeOptions(options, document, window);
+		options = await singlefile.lib.initializeOptions(options);
 		const pageData = await singlefile.lib.getPageData(options);
 		if (options.includeInfobar) {
 			await singlefile.common.ui.content.infobar.includeScript(pageData);

+ 1 - 1
cli/back-ends/webdriver-gecko.js

@@ -144,7 +144,7 @@ function getPageDataScript() {
 		.catch(error => callback({ error: error.toString() }));
 
 	async function getPageData() {
-		await singlefile.lib.initializeOptions(options, document, window);
+		options = await singlefile.lib.initializeOptions(options);
 		const pageData = await singlefile.lib.getPageData(options);
 		if (options.includeInfobar) {
 			await singlefile.common.ui.content.infobar.includeScript(pageData);

+ 3 - 1
lib/index.js

@@ -21,6 +21,8 @@
  *   Source.
  */
 
+/* global window */
+
 this.singlefile = this.singlefile || {
 	lib: {
 		frameTree: {
@@ -34,7 +36,7 @@ this.singlefile = this.singlefile || {
 		},
 		vendor: {},
 		modules: {},
-		initializeOptions: async function (options = {}, doc, win) {
+		initializeOptions: async function (options = {}, doc = window.document, win = window) {
 			this.helper.initDoc(doc);
 			const preInitializationPromises = [];
 			if (!options.saveRawPage) {