Update: support Microsoft Edge

cisco · Dec 18, 2015 · 5ea3c88 · 5ea3c88
1 parent 4c8e24e
commit 5ea3c88
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/gulpfile.js b/gulpfile.js
@@ -226,7 +226,7 @@ var KARMA_CONFIG = {
 };
 var KARMA_BROWSERS = {
   local: ["Chrome", "Firefox"],
-  saucelabs: ["SL_Chrome", "SL_Firefox", "SL_Safari_7", "SL_Safari_8", "SL_Safari_9", "SL_IE_10", "SL_IE_11"]
+  saucelabs: ["SL_Chrome", "SL_Firefox", "SL_Safari_7", "SL_Safari_8", "SL_Safari_9", "SL_IE_10", "SL_IE_11", "SL_EDGE"]
 };
 // allow for IE on windows
 if (/^win/.test(process.platform)) {

diff --git a/lib/algorithms/helpers.js b/lib/algorithms/helpers.js
@@ -120,7 +120,10 @@ exports.setupFallback = function(nodejs, webcrypto, fallback) {
 
       function check(err) {
         if (err.code === DOMException.NOT_SUPPORTED_ERR ||
-            err.message === "Only ArrayBuffer and ArrayBufferView objects can be passed as CryptoOperationData") {
+            // Firefox rejects some operations erroneously complaining about inputs
+            err.message === "Only ArrayBuffer and ArrayBufferView objects can be passed as CryptoOperationData" ||
+            // MS Edge rejects with not an Error
+            !(err instanceof Error)) {
           // not actually supported -- always use fallback
           impl = fallback;
           return impl.apply(null, args);