tcjlj/ZeroOmega
1
0
Fork 0
mirror of https://github.com/zero-peak/ZeroOmega.git synced 2025-02-08 13:38:14 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove Object.create and promisifyAll. Fix #1297.

Browse Source
This commit is contained in:
FelisCatus 2017-11-27 00:43:38 -08:00
parent 05e9f3a245
commit 374d47ab65
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
omega-target-chromium-extension/src/module/chrome_api.coffee
View File

@ -1,9 +1,9 @@
OmegaTarget = require('omega-target') OmegaTarget = require('omega-target')
Promise = OmegaTarget.Promise Promise = OmegaTarget.Promise
chromeApiPromisifer = (originalMethod) -> exports.chromeApiPromisify = (target, method) ->
return (args...) -> return (args...) ->
new Promise (resolve, reject) => new Promise (resolve, reject) ->
callback = (callbackArgs...) -> callback = (callbackArgs...) ->
if chrome.runtime.lastError? if chrome.runtime.lastError?
error = new Error(chrome.runtime.lastError.message) error = new Error(chrome.runtime.lastError.message)
@ -15,7 +15,4 @@ chromeApiPromisifer = (originalMethod) ->
resolve(callbackArgs) resolve(callbackArgs)
args.push(callback) args.push(callback)
originalMethod.apply(this, args) target[method].apply(target, args)
module.exports = (obj) ->
Promise.promisifyAll(Object.create(obj), {promisifier: chromeApiPromisifer})

9
omega-target-chromium-extension/src/module/options.coffee
View File

@ -2,9 +2,12 @@ OcontextMenu_inspectElementmegaTarget = require('omega-target')
OmegaPac = OmegaTarget.OmegaPac OmegaPac = OmegaTarget.OmegaPac
Promise = OmegaTarget.Promise Promise = OmegaTarget.Promise
querystring = require('querystring') querystring = require('querystring')
chromeApiPromisifyAll = require('./chrome_api') chromeApiPromisify = require('./chrome_api').chromeApiPromisify
if chrome?.proxy?.settings if chrome?.proxy?.settings
proxySettings = chromeApiPromisifyAll(chrome.proxy.settings) proxySettings =
clearAsync: chromeApiPromisify(chrome.proxy.settings, 'clear')
setAsync: chromeApiPromisify(chrome.proxy.settings, 'set')
get: chrome.proxy.settings.get.bind(chrome.proxy.settings)
else else
proxySettings = proxySettings =
setAsync: -> Promise.resolve() setAsync: -> Promise.resolve()
@ -139,7 +142,7 @@ class ChromeOptions extends OmegaTarget.Options
meta ?= profile meta ?= profile
if profile.profileType == 'SystemProfile' if profile.profileType == 'SystemProfile'
# Clear proxy settings, returning proxy control to Chromium. # Clear proxy settings, returning proxy control to Chromium.
return proxySettings.clearAsync({}).then => return chromeApiPromisify(chrome.proxy.settings, 'clear')({}).then =>
proxySettings.get {}, @_proxyChangeListener proxySettings.get {}, @_proxyChangeListener
return return
config = {} config = {}

11
omega-target-chromium-extension/src/module/storage.coffee
View File

@ -1,4 +1,4 @@
chromeApiPromisifyAll = require('./chrome_api') chromeApiPromisify = require('./chrome_api').chromeApiPromisify
OmegaTarget = require('omega-target') OmegaTarget = require('omega-target')
Promise = OmegaTarget.Promise Promise = OmegaTarget.Promise
@ -39,12 +39,11 @@ class ChromeStorage extends OmegaTarget.Storage
if browser?.storage?[@areaName] if browser?.storage?[@areaName]
@storage = browser.storage[@areaName] @storage = browser.storage[@areaName]
else else
wrapper = chromeApiPromisifyAll(chrome.storage[@areaName])
@storage = @storage =
get: wrapper.getAsync.bind(wrapper), get: chromeApiPromisify(chrome.storage[@areaName], 'get')
set: wrapper.setAsync.bind(wrapper), set: chromeApiPromisify(chrome.storage[@areaName], 'set')
remove: wrapper.removeAsync.bind(wrapper), remove: chromeApiPromisify(chrome.storage[@areaName], 'remove')
clear: wrapper.clearAsync.bind(wrapper), clear: chromeApiPromisify(chrome.storage[@areaName], 'clear')
get: (keys) -> get: (keys) ->
keys ?= null keys ?= null