fix(plugin-encryption): make several tweaks for browser support

webex · Sep 8, 2016 · 4302db0 · 4302db0
1 parent f01e32f
commit 4302db0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/packages/plugin-encryption/package.json b/packages/plugin-encryption/package.json
@@ -33,5 +33,9 @@
     "babel-register": "^6.4.3",
     "eslint": "^3.3.1",
     "eslint-plugin-mocha": "^4.4.0"
+  },
+  "browser": {
+    "./src/ensure-buffer.js": "./src/ensure-buffer.browser.js",
+    "./dist/ensure-buffer.js": "./dist/ensure-buffer.browser.js"
   }
 }
diff --git a/packages/plugin-encryption/src/ensure-buffer.browser.js b/packages/plugin-encryption/src/ensure-buffer.browser.js
@@ -22,6 +22,10 @@ export default function ensureBuffer(buffer) {
     return Promise.resolve(buffer.toArrayBuffer());
   }
 
+  if (buffer.buffer) {
+    return Promise.resolve(buffer.buffer);
+  }
+
   return new Promise((resolve, reject) => {
     const fr = new FileReader();