Skip to content
This repository was archived by the owner on Aug 24, 2021. It is now read-only.

feat: change window to self for webworker support #15

Merged
merged 4 commits into from
Feb 8, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -44,7 +44,7 @@
"nodeify": "^1.0.0"
},
"devDependencies": {
"aegir": "^9.4.0",
"aegir": "^10.0.0",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you remove the --webworker flags in the scripts please, as they are not needed anymore

"benchmark": "^2.1.3",
"chai": "^3.5.0",
"pre-commit": "^1.2.2"
Expand All @@ -63,4 +63,4 @@
"Richard Littauer <[email protected]>",
"npm-to-cdn-bot (by Forbes Lindesay) <[email protected]>"
]
}
}
19 changes: 4 additions & 15 deletions src/crypto-sha1-2-browser.js
Original file line number Diff line number Diff line change
@@ -1,27 +1,16 @@
/* global self */
'use strict'

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
}
}

Expand Down