aboutsummaryrefslogtreecommitdiff
path: root/src/library_uuid.js
diff options
context:
space:
mode:
authorFraser Adams <fraser.adams@blueyonder.co.uk>2014-01-07 09:22:16 +0000
committerFraser Adams <fraser.adams@blueyonder.co.uk>2014-01-07 09:22:16 +0000
commita4b3e03260b90e288925cc1dfd9d4d591bc7741c (patch)
treeb15c7f0505f36f6ae985d10c2168545082738c63 /src/library_uuid.js
parent3bdbd008f9f95e6a1d8da42e61a751289db17b60 (diff)
Added ENVIRONMENT_IS_WEB test prior to checking window.crypto etc. so we are sure that window is defined
Diffstat (limited to 'src/library_uuid.js')
-rw-r--r--src/library_uuid.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/library_uuid.js b/src/library_uuid.js
index 9a0377ae..adfd1882 100644
--- a/src/library_uuid.js
+++ b/src/library_uuid.js
@@ -35,7 +35,8 @@ mergeInto(LibraryManager.library, {
var rb = require('crypto').randomBytes;
uuid = rb(16);
} catch(e) {}
- } else if (typeof(window.crypto) !== 'undefined' &&
+ } else if (ENVIRONMENT_IS_WEB &&
+ typeof(window.crypto) !== 'undefined' &&
typeof(window.crypto.getRandomValues) !== 'undefined') {
// If crypto.getRandomValues is available try to use it.
uuid = new Uint8Array(16);