Fix Illegal invocation error when using aliased window.btoa or window…

….atob
ross-pfahler · Feb 4, 2014 · cc2a837 · cc2a837
1 parent bdd125b
commit cc2a837
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/base64.js b/base64.js
@@ -9,7 +9,7 @@ InvalidCharacterError.prototype.name = 'InvalidCharacterError';
 
 // encoder
 // [https://gist.github.com/999166] by [https://github.com/nignag]
-base64.btoa = window.btoa || function (input) {
+base64.btoa = window.btoa ? function(input) { return window.btoa(input); } : function (input) {
   for (
     // initialize result and counter
     var block, charCode, idx = 0, map = chars, output = '';
@@ -31,7 +31,7 @@ base64.btoa = window.btoa || function (input) {
 
 // decoder
 // [https://gist.github.com/1020396] by [https://github.com/atk]
-base64.atob = window.atob || function (input) {
+base64.atob = window.atob ? function(input) { return window.atob(input); } : function (input) {
   input = input.replace(/=+$/, '')
   if (input.length % 4 == 1) {
     throw new InvalidCharacterError("'atob' failed: The string to be decoded is not correctly encoded.");

diff --git a/base64.min.js b/base64.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Base64",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "Base64 encoding and decoding",
   "author": "David Chambers <[email protected]>",
   "main": "./base64.js",