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

Commit d89e039

Browse files
dryajovdignifiedquire
authored andcommitted
feat: change window to self for webworker support
1 parent 68f4cb2 commit d89e039

File tree

2 files changed

+11
-22
lines changed

2 files changed

+11
-22
lines changed

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
"./src/crypto-sha1-2.js": "./src/crypto-sha1-2-browser.js"
88
},
99
"scripts": {
10-
"test": "aegir-test --webworker",
11-
"test:browser": "aegir-test browser --webworker",
10+
"test": "aegir-test",
11+
"test:browser": "aegir-test browser",
1212
"test:node": "aegir-test node",
1313
"lint": "aegir-lint",
1414
"docs": "aegir-docs",
15-
"release": "aegir-release --docs --webworker",
16-
"release-minor": "aegir-release minor --docs --webworker",
17-
"release-major": "aegir-release major --docs --webworker",
15+
"release": "aegir-release --docs",
16+
"release-minor": "aegir-release minor --docs",
17+
"release-major": "aegir-release major --docs",
1818
"build": "aegir-build",
1919
"coverage": "aegir-coverage",
2020
"coverage-publish": "aegir-coverage publish",
@@ -44,7 +44,7 @@
4444
"nodeify": "^1.0.0"
4545
},
4646
"devDependencies": {
47-
"aegir": "^9.4.0",
47+
"aegir": "^10.0.0",
4848
"benchmark": "^2.1.3",
4949
"chai": "^3.5.0",
5050
"pre-commit": "^1.2.2"
@@ -63,4 +63,4 @@
6363
"Richard Littauer <[email protected]>",
6464
"npm-to-cdn-bot (by Forbes Lindesay) <[email protected]>"
6565
]
66-
}
66+
}

src/crypto-sha1-2-browser.js

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,16 @@
1-
/* global self */
21
'use strict'
32

43
const nodeify = require('nodeify')
54

65
const webCrypto = getWebCrypto()
76

87
function getWebCrypto () {
9-
let globalContext
10-
11-
if (typeof window !== 'undefined') {
12-
globalContext = window
13-
} else if (typeof self !== 'undefined') {
14-
globalContext = self
15-
} else {
16-
return
17-
}
18-
19-
if (globalContext.crypto) {
20-
return globalContext.crypto.subtle || globalContext.crypto.webkitSubtle
8+
if (self.crypto) {
9+
return self.crypto.subtle || self.crypto.webkitSubtle
2110
}
2211

23-
if (globalContext.msCrypto) {
24-
return globalContext.msCrypto.subtle
12+
if (self.msCrypto) {
13+
return self.msCrypto.subtle
2514
}
2615
}
2716

0 commit comments

Comments
 (0)