do clearer case checking and load minified lib in worker

This commit is contained in:
Tankred Hase 2014-02-12 19:28:54 +01:00
parent b535b83d66
commit 37c6ab8a0c
2 changed files with 2 additions and 2 deletions

View File

@ -231,7 +231,7 @@ function generateKeyPair(keyType, numBits, userId, passphrase, callback) {
* Are we in a browser and do we support worker?
*/
function useWorker(callback) {
if (typeof callback === 'undefined') {
if (typeof window === 'undefined' || !window.Worker || typeof callback !== 'function') {
return false;
}

View File

@ -17,7 +17,7 @@
window = {}; // to make UMD bundles work
importScripts('openpgp.js');
importScripts('openpgp.min.js');
var MIN_SIZE_RANDOM_BUFFER = 40000;
var MAX_SIZE_RANDOM_BUFFER = 60000;