diff --git a/app/js/lib/config.js b/app/js/lib/config.js index 2f03ddb9..b249f838 100644 --- a/app/js/lib/config.js +++ b/app/js/lib/config.js @@ -29,6 +29,8 @@ Config.Modes = { test: location.search.indexOf('test=1') > 0, debug: location.search.indexOf('debug=1') > 0, ssl: location.search.indexOf('ssl=1') > 0 || location.protocol == 'https:', + nacl: location.search.indexOf('nacl=0')== -1, + webcrypto: location.search.indexOf('webcrypto=0')== -1, packed: location.protocol == 'app:' || location.protocol == 'chrome-extension:', ios_standalone: window.navigator.standalone && navigator.userAgent.match(/iOS|iPhone|iPad/), chrome_packed: window.chrome && chrome.app && chrome.app.window && true || false diff --git a/app/js/lib/ng_utils.js b/app/js/lib/ng_utils.js index c9ddc0ff..41384701 100644 --- a/app/js/lib/ng_utils.js +++ b/app/js/lib/ng_utils.js @@ -507,7 +507,7 @@ angular.module('izhukov.utils', []) naClEmbed = false, taskID = 0, awaiting = {}, - webCrypto = window.crypto && (window.crypto.subtle || window.crypto.webkitSubtle)/* || window.msCrypto && window.msCrypto.subtle*/, + webCrypto = Config.Modes.webcrypto && window.crypto && (window.crypto.subtle || window.crypto.webkitSubtle)/* || window.msCrypto && window.msCrypto.subtle*/, useSha1Crypto = webCrypto && webCrypto.digest !== undefined, finalizeTask = function (taskID, result) { var deferred = awaiting[taskID]; @@ -518,7 +518,8 @@ angular.module('izhukov.utils', []) } }; - if (navigator.mimeTypes && + if (Config.Modes.nacl && + navigator.mimeTypes && navigator.mimeTypes['application/x-pnacl'] !== undefined) { var listener = $('
').appendTo($('body'))[0]; listener.addEventListener('load', function (e) {