code improvement

This commit is contained in:
Boik 2017-09-17 13:56:22 +08:00
parent 26e6f2c46c
commit d86724f17a

View file

@ -14,7 +14,7 @@ const matchesPattern = function (pattern) {
const runContentScript = function (extensionId, url, code) { const runContentScript = function (extensionId, url, code) {
const context = {} const context = {}
require('./chrome-api').injectTo(extensionId, false, context) require('./chrome-api').injectTo(extensionId, false, context)
const wrapper = `(function (chrome) {\n ${code}\n })` const wrapper = `((chrome) => {\n ${code}\n })`
const compiledWrapper = runInThisContext(wrapper, { const compiledWrapper = runInThisContext(wrapper, {
filename: url, filename: url,
lineOffset: 1, lineOffset: 1,
@ -24,10 +24,9 @@ const runContentScript = function (extensionId, url, code) {
} }
const runStylesheet = function (url, code) { const runStylesheet = function (url, code) {
const wrapper = `(function (code) { const wrapper = `((code) => {
function init() { function init() {
var styleElement = document.createElement('style'); const styleElement = document.createElement('style');
styleElement.setAttribute('type', 'text/css');
styleElement.textContent = code; styleElement.textContent = code;
document.head.append(styleElement); document.head.append(styleElement);
} }
@ -46,27 +45,27 @@ const runStylesheet = function (url, code) {
const injectContentScript = function (extensionId, script) { const injectContentScript = function (extensionId, script) {
if (!script.matches.some(matchesPattern)) return if (!script.matches.some(matchesPattern)) return
if (script.js.length) { if (script.js) {
for (const {url, code} of script.js) { for (const {url, code} of script.js) {
const fire = runContentScript.bind(window, extensionId, url, code) const fire = runContentScript.bind(window, extensionId, url, code)
if (script.runAt === 'document_start') { if (script.runAt === 'document_start') {
process.once('document-start', fire) process.once('document-start', fire)
} else if (script.runAt === 'document_end') { } else if (script.runAt === 'document_end') {
process.once('document-end', fire) process.once('document-end', fire)
} else if (script.runAt === 'document_idle') { } else {
document.addEventListener('DOMContentLoaded', fire) document.addEventListener('DOMContentLoaded', fire)
} }
} }
} }
if (script.css.length) { if (script.css) {
for (const {url, code} of script.css) { for (const {url, code} of script.css) {
const fire = runStylesheet.bind(window, url, code) const fire = runStylesheet.bind(window, url, code)
if (script.runAt === 'document_start') { if (script.runAt === 'document_start') {
process.once('document-start', fire) process.once('document-start', fire)
} else if (script.runAt === 'document_end') { } else if (script.runAt === 'document_end') {
process.once('document-end', fire) process.once('document-end', fire)
} else if (script.runAt === 'document_idle') { } else {
document.addEventListener('DOMContentLoaded', fire) document.addEventListener('DOMContentLoaded', fire)
} }
} }