From 325115b7ea9c90ae0873f3628e03101f4fa9b920 Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Tue, 13 Jan 2015 16:27:34 -1000 Subject: [PATCH] Skip NaCL if we're not running from chrome-extension: --- libtextsecure/nativeclient.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libtextsecure/nativeclient.js b/libtextsecure/nativeclient.js index b066c28b..3d700300 100644 --- a/libtextsecure/nativeclient.js +++ b/libtextsecure/nativeclient.js @@ -17,8 +17,9 @@ 'use strict'; window.textsecure = window.textsecure || {}; - if (navigator.mimeTypes['application/x-nacl'] === undefined && - navigator.mimeTypes['application/x-pnacl'] === undefined) { + if ((navigator.mimeTypes['application/x-nacl'] === undefined && + navigator.mimeTypes['application/x-pnacl'] === undefined) || + window.location.protocol != "chrome-extension:") { // browser does not support native client. return; }