diff --git a/package.json b/package.json index 52556417..b45b1ae2 100644 --- a/package.json +++ b/package.json @@ -7,14 +7,14 @@ "./src/crypto-sha1-2.js": "./src/crypto-sha1-2-browser.js" }, "scripts": { - "test": "aegir-test --webworker", - "test:browser": "aegir-test browser --webworker", + "test": "aegir-test", + "test:browser": "aegir-test browser", "test:node": "aegir-test node", "lint": "aegir-lint", "docs": "aegir-docs", - "release": "aegir-release --docs --webworker", - "release-minor": "aegir-release minor --docs --webworker", - "release-major": "aegir-release major --docs --webworker", + "release": "aegir-release --docs", + "release-minor": "aegir-release minor --docs", + "release-major": "aegir-release major --docs", "build": "aegir-build", "coverage": "aegir-coverage", "coverage-publish": "aegir-coverage publish", @@ -44,7 +44,7 @@ "nodeify": "^1.0.0" }, "devDependencies": { - "aegir": "^9.4.0", + "aegir": "^10.0.0", "benchmark": "^2.1.3", "chai": "^3.5.0", "pre-commit": "^1.2.2" @@ -63,4 +63,4 @@ "Richard Littauer ", "npm-to-cdn-bot (by Forbes Lindesay) " ] -} \ No newline at end of file +} diff --git a/src/crypto-sha1-2-browser.js b/src/crypto-sha1-2-browser.js index 837c26ec..17742ec0 100644 --- a/src/crypto-sha1-2-browser.js +++ b/src/crypto-sha1-2-browser.js @@ -1,4 +1,3 @@ -/* global self */ 'use strict' const nodeify = require('nodeify') @@ -6,22 +5,12 @@ const nodeify = require('nodeify') const webCrypto = getWebCrypto() function getWebCrypto () { - let globalContext - - if (typeof window !== 'undefined') { - globalContext = window - } else if (typeof self !== 'undefined') { - globalContext = self - } else { - return - } - - if (globalContext.crypto) { - return globalContext.crypto.subtle || globalContext.crypto.webkitSubtle + if (self.crypto) { + return self.crypto.subtle || self.crypto.webkitSubtle } - if (globalContext.msCrypto) { - return globalContext.msCrypto.subtle + if (self.msCrypto) { + return self.msCrypto.subtle } }