js-base64 2.6.2 → 2.6.3

package/base64.js

@@ -22,7 +22,7 @@
     // existing version for noConflict()
     global = global || {};
     var _Base64 = global.Base64;
-    var version = "2.6.2";
+    var version = "2.6.3";
     // constants
     var b64chars
         = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
@@ -155,16 +155,17 @@
         return _atob(String(a).replace(/[^A-Za-z0-9\+\/]/g, ''));
     };
     var _decode = function(a) { return btou(_atob(a)) };
+    var _fromURI = function(a) {
+        return String(a).replace(/[-_]/g, function(m0) {
+            return m0 == '-' ? '+' : '/'
+        }).replace(/[^A-Za-z0-9\+\/]/g, '');
+    };
     var decode = function(a){
-        return _decode(
-            String(a).replace(/[-_]/g, function(m0) {
-                return m0 == '-' ? '+' : '/'
-            }).replace(/[^A-Za-z0-9\+\/]/g, '')
-        );
+        return _decode(_fromURI(a));
     };
     var toUint8Array;
     if (global.Uint8Array) toUint8Array = function(a) {
-        return Uint8Array.from(atob(a), function(c) {
+        return Uint8Array.from(atob(_fromURI(a)), function(c) {
             return c.charCodeAt(0);
         });
     };

package/bower.json

@@ -1,6 +1,6 @@
 {
   "name": "js-base64",
-  "version": "2.6.2",
+  "version": "2.6.3",
   "license": "BSD-3-Clause",
   "main": [
     "./base64.js"

package/package.js

@@ -6,4 +6,4 @@ Package.on_use(function(api){
     api.export('Base64');
 
     api.add_files(['base64.js'], 'server');
-});
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "js-base64",
-  "version": "2.6.2",
+  "version": "2.6.3",
   "description": "Yet another Base64 transcoder in pure-JS",
   "main": "base64.js",
   "directories": {

package/test/dankogai.js

@@ -43,7 +43,7 @@ describe('Base64', function () {
     it('.decode', is(Base64.decode('5bCP6aO85by-'), '小飼弾'));
 });
 
-if (typeof Uint8Array === 'function') describe('fromBase64', function() {
+if (typeof Uint8Array === 'function') describe('fromUint8Array', function() {
     it('dankogai', is(Base64.fromUint8Array(new Uint8Array([100,97,110,107,111,103,97,105])), Base64.encode('dankogai')));
     it('dankoga', is(Base64.fromUint8Array(new Uint8Array([100,97,110,107,111,103,97])), Base64.encode('dankoga')));
     it('dankog', is(Base64.fromUint8Array(new Uint8Array([100,97,110,107,111,103])), Base64.encode('dankog')));
@@ -55,7 +55,7 @@ if (typeof Uint8Array === 'function') describe('fromBase64', function() {
     it('', is(Base64.fromUint8Array(new Uint8Array([])), Base64.encode('')));
 });
 
-if (typeof Uint8Array === 'function') describe('toBase64', function() {
+if (typeof Uint8Array === 'function') describe('toUint8Array', function() {
     it('ZGFua29nYWk=', is(Base64.toUint8Array('ZGFua29nYWk=').toString(), '100,97,110,107,111,103,97,105'));
     it('ZGFua29nYQ==', is(Base64.toUint8Array('ZGFua29nYQ==').toString(), '100,97,110,107,111,103,97'));
     it('ZGFua29n', is(Base64.toUint8Array('ZGFua29n').toString(), '100,97,110,107,111,103'));