Skip to content

Commit

Permalink
Lock the linter to a specific version
Browse files Browse the repository at this point in the history
Update the code to satisfy the linter
  • Loading branch information
jforbes committed Jul 26, 2016
1 parent 22bde06 commit 0c992ab
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
"test/"
],
"dependencies": {
"global": "^4.3.0",
"pkcs7": "^0.2.3"
},
"devDependencies": {
Expand All @@ -88,7 +89,6 @@
"chg": "^0.3.2",
"doctoc": "^0.15.0",
"glob": "^6.0.3",
"global": "^4.3.0",
"jsdoc": "^3.4.0",
"karma": "^0.13.19",
"karma-chrome-launcher": "^0.2.2",
Expand All @@ -103,6 +103,6 @@
"rimraf": "^2.5.1",
"sinon": "~1.14.0",
"uglify-js": "^2.6.1",
"videojs-standard": "^4.0.0"
"videojs-standard": "4.0.2"
}
}
3 changes: 2 additions & 1 deletion src/decrypter.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* PKCS#7 padding.
*/

import window from 'global/window';
import AES from './aes';
import AsyncStream from './async-stream';
import {unpad} from 'pkcs7';
Expand Down Expand Up @@ -188,7 +189,7 @@ const getWebCrypto = function() {
return null;
}

let _crypto = window ? window.crypto : crypto;
let _crypto = window.crypto;

if (!_crypto) {
return null;
Expand Down

0 comments on commit 0c992ab

Please sign in to comment.