Changeset 25494 for lang/javascript/Base64

Timestamp:

12/01/08 07:32:36 (6 weeks ago)

Author:

drry

Message:

• added subversion props.
  
• et cetera.
  

Location:

lang/javascript/Base64/trunk

Files:

• base64.html (modified) (1 prop)
• base64.js (modified) (10 diffs)
• test/functional.html (modified) (6 diffs, 1 prop)
• test/performance.html (modified) (2 diffs, 1 prop)

lang/javascript/Base64/trunk/base64.js

@@ -5 +5 @@
 (function(){
 
-var b64chars 
+var b64chars
     = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
 
-var b64charcodes = function() {
+var b64charcodes = function(){
     var a = [];
     var codeA = 'A'.charCodeAt(0);
@@ -27 +27 @@
 }(b64chars);
 
-var stringToArray = function(s) {
+var stringToArray = function(s){
     var a = [];
     for (var i = 0, l = s.length; i < l; i ++) a[i] = s.charCodeAt(i);
@@ -35 +35 @@
 var convertUTF8ArrayToBase64 = function(bin){
     var padlen = 0;
-    while(bin.length % 3) {
+    while (bin.length % 3){
         bin.push(0);
         padlen++;
@@ -42 +42 @@
     for (var i = 0, l = bin.length; i < l; i += 3){
         var c0 = bin[i], c1 = bin[i+1], c2 = bin[i+2];
-        if (c0 >= 256 || c1 >= 256 || c2 >= 256) 
+        if (c0 >= 256 || c1 >= 256 || c2 >= 256)
             throw 'unsupported character found';
         var n = (c0 << 16) | (c1 << 8) | c2;
@@ -52 +52 @@
         );
     }
-    while(padlen--) b64[b64.length - padlen - 1] = '='.charCodeAt(0);
+    while (padlen--) b64[b64.length - padlen - 1] = '='.charCodeAt(0);
     return String.fromCharCode.apply(String, b64);
 };
 
-var convertBase64ToUTF8Array = function(b64) {
-    b64 = b64.replace(/[^A-Za-z0-9\+\/]/g, '');
+var convertBase64ToUTF8Array = function(b64){
+    b64 = b64.replace(/[^A-Za-z0-9+\/]+/g, '');
     var bin = [];
     var padlen = b64.length % 4;
@@ -102 +102 @@
         }else{
             var c1 = bin[++i];
-            if(c0 < 0xe0){
+            if (c0 < 0xe0){
                 uni.push(((c0 & 0x1f) << 6) | (c1 & 0x3f));
             }else{
                 var c2 = bin[++i];
                 uni.push(
-                       ((c0 & 0x0f) << 12) | ((c1 & 0x3f) <<  6) | (c2 & 0x3f)
+                       ((c0 & 0x0f) << 12) | ((c1 & 0x3f) << 6) | (c2 & 0x3f)
                 );
             }
@@ -147 +147 @@
 };
 
-if (window.btoa) {
+if (window.btoa){
     var btoa = window.btoa;
-    var convertUTF16StringToBase64 = function (uni) {
+    var convertUTF16StringToBase64 = function (uni){
         return btoa(convertUTF16StringToUTF8String(uni));
     };
@@ -155 +155 @@
 else {
     var btoa = convertUTF8StringToBase64;
-    var convertUTF16StringToBase64 = function (uni) {
+    var convertUTF16StringToBase64 = function (uni){
         return convertUTF8ArrayToBase64(convertUTF16StringToUTF8Array(uni));
     };
 }
 
-if (window.atob) {
+if (window.atob){
     var atob = window.atob;
-    var convertBase64ToUTF16String = function (b64) {
+    var convertBase64ToUTF16String = function (b64){
         return convertUTF8StringToUTF16String(atob(b64));
     };
@@ -168 +168 @@
 else {
     var atob = convertBase64ToUTF8String;
-    var convertBase64ToUTF16String = function (b64) {
+    var convertBase64ToUTF16String = function (b64){
         return convertUTF8ArrayToUTF16String(convertBase64ToUTF8Array(b64));
     };
@@ -206 +206 @@
         }).replace(/=+$/, '');
     },
-    decode:function(a){ 
+    decode:function(a){
         return convertBase64ToUTF16String(a.replace(/[-_]/g, function(m0){
             return m0 == '-' ? '+' : '/';

lang/javascript/Base64/trunk/test/functional.html

@@ -101 +101 @@
                         [[0x61, 0x3042], [0x61, 0xE3, 0x81, 0x82]],
                         [[0x3042, 0x61], [0xE3, 0x81, 0x82, 0x61]],
-                        [[0x307E, 0x307F], [0xE3, 0x81, 0xBE, 0xE3, 0x81, 0xBF]] 
+                        [[0x307E, 0x307F], [0xE3, 0x81, 0xBE, 0xE3, 0x81, 0xBF]]
                     ],
                     convertUTF16ArrayToByteArray:[
@@ -111 +111 @@
                         [[0x61, 0x3042], [0x61, 0xE3, 0x81, 0x82]],
                         [[0x3042, 0x61], [0xE3, 0x81, 0x82, 0x61]],
-                        [[0x307E, 0x307F], [0xE3, 0x81, 0xBE, 0xE3, 0x81, 0xBF]] 
+                        [[0x307E, 0x307F], [0xE3, 0x81, 0xBE, 0xE3, 0x81, 0xBF]]
                     ],
                     convertUTF8ArrayToUTF16Array:[
@@ -121 +121 @@
                         [[0x61, 0xE3, 0x81, 0x82], [0x61, 0x3042]],
                         [[0xE3, 0x81, 0x82, 0x61], [0x3042, 0x61]],
-                        [[0xE3, 0x81, 0xBE, 0xE3, 0x81, 0xBF], [0x307E, 0x307F]] 
+                        [[0xE3, 0x81, 0xBE, 0xE3, 0x81, 0xBF], [0x307E, 0x307F]]
                     ],
                     convertByteArrayToUTF16Array:[
@@ -131 +131 @@
                         [[0x61, 0xE3, 0x81, 0x82], [0x61, 0x3042]],
                         [[0xE3, 0x81, 0x82, 0x61], [0x3042, 0x61]],
-                        [[0xE3, 0x81, 0xBE, 0xE3, 0x81, 0xBF], [0x307E, 0x307F]] 
+                        [[0xE3, 0x81, 0xBE, 0xE3, 0x81, 0xBF], [0x307E, 0x307F]]
                     ],
                     convertUTF8StringToBase64:[
@@ -161 +161 @@
                         ['\u0061\u00E3\u0081\u0082', [0x61, 0x3042]],
                         ['\u00E3\u0081\u0082\u0061', [0x3042, 0x61]],
-                        ['\u00E3\u0081\u00BE\u00E3\u0081\u00BF', [0x307E, 0x307F]] 
+                        ['\u00E3\u0081\u00BE\u00E3\u0081\u00BF', [0x307E, 0x307F]]
                     ],
                     convertUTF8ArrayToUTF16String:[
@@ -221 +221 @@
                         [[0x61, 0x3042], '\u0061\u00E3\u0081\u0082'],
                         [[0x3042, 0x61], '\u00E3\u0081\u0082\u0061'],
-                        [[0x307E, 0x307F], '\u00E3\u0081\u00BE\u00E3\u0081\u00BF'] 
+                        [[0x307E, 0x307F], '\u00E3\u0081\u00BE\u00E3\u0081\u00BF']
                     ],
                     convertUTF16StringToUTF8String:[

lang/javascript/Base64/trunk/test/performance.html

@@ -15 +15 @@
                     Base64[method] = function() {
                         log[logIndex++] = '<li>' + method + ' start: ' + (new Date - start) + '</li>';
-                        if (fn.apply && !(fn + '').match(/native/))
+                        if (fn.apply && (fn + '').indexOf('[native code]') < 0)
                             var r = fn.apply(this, arguments);
                         else
@@ -22 +22 @@
                         return r;
                     };
-                })(method)
+                })(method);
 
                 var sources = [];