From c3b765ca8e26feb796a4c75cced8e60f0d5fd719 Mon Sep 17 00:00:00 2001 From: jebbs Date: Wed, 26 Sep 2018 16:48:26 +0800 Subject: [PATCH] code optimize --- scripts/extract.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/scripts/extract.js b/scripts/extract.js index 2271d27..5eb45b2 100644 --- a/scripts/extract.js +++ b/scripts/extract.js @@ -5,10 +5,9 @@ * @param {...any} args url list / url templates, page numers, either [from, to, interval] or [...pages] */ async function extract(itemsSelector, fieldSelectors, ...args) { - let data = await extractData(itemsSelector, fieldSelectors, ...args); + let data = await getData(itemsSelector, fieldSelectors, ...args); data.unshift(fieldSelectors); saveFileAsk(data); - resolve("save done.") } /** @@ -17,7 +16,7 @@ async function extract(itemsSelector, fieldSelectors, ...args) { * @param {Array} fieldSelectors fields selectors for selecting fields (data columns) under each item * @param {...any} args url list / url templates, page numers, either [from, to, interval] or [...pages] */ -async function extractData(itemsSelector, fieldSelectors, ...args) { +async function getData(itemsSelector, fieldSelectors, ...args) { let urls = []; let arg = args.shift(); if (arg instanceof Array) { @@ -41,7 +40,7 @@ async function extractData(itemsSelector, fieldSelectors, ...args) { return new Promise((resolve, reject) => { chrome.tabs.query({ active: true, - currentWindow: true + currentWindow: false }, function (tabs) { let pms; let tab = tabs[0];