From df74bf0a17048fd2f5af483688325232acbcf036 Mon Sep 17 00:00:00 2001 From: Feross Aboukhadijeh Date: Tue, 7 Jan 2014 23:30:19 -0800 Subject: [PATCH] consistent style --- lib/b64.js | 86 ++++++++++++++++++++++++++---------------------------- 1 file changed, 41 insertions(+), 45 deletions(-) diff --git a/lib/b64.js b/lib/b64.js index 8c89460..887f706 100644 --- a/lib/b64.js +++ b/lib/b64.js @@ -16,22 +16,22 @@ var lookup = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'; function decode (elt) { var code = elt.charCodeAt(0) - if(code === PLUS) + if (code === PLUS) return 62 // '+' - if(code === SLASH) + if (code === SLASH) return 63 // '/' - if(code < NUMBER) + if (code < NUMBER) return -1 //no match - if(code < NUMBER + 10) + if (code < NUMBER + 10) return code - NUMBER + 26 + 26 - if(code < UPPER + 26) + if (code < UPPER + 26) return code - UPPER - if(code < LOWER + 26) + if (code < LOWER + 26) return code - LOWER + 26 } - function b64ToByteArray(b64) { - var i, j, l, tmp, placeHolders, arr; + function b64ToByteArray (b64) { + var i, j, l, tmp, placeHolders, arr if (b64.length % 4 > 0) { throw new Error('Invalid string. Length must be a multiple of 4') @@ -46,13 +46,10 @@ var lookup = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'; placeHolders = '=' === b64.charAt(len - 2) ? 2 : '=' === b64.charAt(len - 1) ? 1 : 0 // base64 is 4/3 + up to two characters of the original data - arr = new Arr(b64.length * 3 / 4 - placeHolders); + arr = new Arr(b64.length * 3 / 4 - placeHolders) // if there are placeholders, only get up to the last complete 4 chars - - - - l = placeHolders > 0 ? b64.length - 4 : b64.length; + l = placeHolders > 0 ? b64.length - 4 : b64.length var L = 0 @@ -61,65 +58,64 @@ var lookup = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'; } for (i = 0, j = 0; i < l; i += 4, j += 3) { - tmp = (decode(b64.charAt(i)) << 18) | (decode(b64.charAt(i + 1)) << 12) | (decode(b64.charAt(i + 2)) << 6) | decode(b64.charAt(i + 3)); - push((tmp & 0xFF0000) >> 16); - push((tmp & 0xFF00) >> 8); - push(tmp & 0xFF); + tmp = (decode(b64.charAt(i)) << 18) | (decode(b64.charAt(i + 1)) << 12) | (decode(b64.charAt(i + 2)) << 6) | decode(b64.charAt(i + 3)) + push((tmp & 0xFF0000) >> 16) + push((tmp & 0xFF00) >> 8) + push(tmp & 0xFF) } if (placeHolders === 2) { - tmp = (decode(b64.charAt(i)) << 2) | (decode(b64.charAt(i + 1)) >> 4); - push(tmp & 0xFF); + tmp = (decode(b64.charAt(i)) << 2) | (decode(b64.charAt(i + 1)) >> 4) + push(tmp & 0xFF) } else if (placeHolders === 1) { - tmp = (decode(b64.charAt(i)) << 10) | (decode(b64.charAt(i + 1)) << 4) | (decode(b64.charAt(i + 2)) >> 2); - push((tmp >> 8) & 0xFF); - push(tmp & 0xFF); + tmp = (decode(b64.charAt(i)) << 10) | (decode(b64.charAt(i + 1)) << 4) | (decode(b64.charAt(i + 2)) >> 2) + push((tmp >> 8) & 0xFF) + push(tmp & 0xFF) } - return arr; + return arr } - function uint8ToBase64(uint8) { + function uint8ToBase64 (uint8) { var i, extraBytes = uint8.length % 3, // if we have 1 byte left, pad 2 bytes output = "", - temp, length; + temp, length function encode (num) { return lookup.charAt(num) } function tripletToBase64 (num) { - return encode(num >> 18 & 0x3F) + encode(num >> 12 & 0x3F) + encode(num >> 6 & 0x3F) + encode(num & 0x3F); - }; + return encode(num >> 18 & 0x3F) + encode(num >> 12 & 0x3F) + encode(num >> 6 & 0x3F) + encode(num & 0x3F) + } // go through the array every three bytes, we'll deal with trailing stuff later for (i = 0, length = uint8.length - extraBytes; i < length; i += 3) { - temp = (uint8[i] << 16) + (uint8[i + 1] << 8) + (uint8[i + 2]); - output += tripletToBase64(temp); + temp = (uint8[i] << 16) + (uint8[i + 1] << 8) + (uint8[i + 2]) + output += tripletToBase64(temp) } // pad the end with zeros, but make sure to not forget the extra bytes switch (extraBytes) { case 1: - temp = uint8[uint8.length - 1]; - output += encode(temp >> 2); - output += encode((temp << 4) & 0x3F); - output += '=='; - break; + temp = uint8[uint8.length - 1] + output += encode(temp >> 2) + output += encode((temp << 4) & 0x3F) + output += '==' + break case 2: - temp = (uint8[uint8.length - 2] << 8) + (uint8[uint8.length - 1]); - output += encode(temp >> 10); - output += encode((temp >> 4) & 0x3F); - output += encode((temp << 2) & 0x3F); - output += '='; - break; + temp = (uint8[uint8.length - 2] << 8) + (uint8[uint8.length - 1]) + output += encode(temp >> 10) + output += encode((temp >> 4) & 0x3F) + output += encode((temp << 2) & 0x3F) + output += '=' + break } - return output; + return output } - module.exports.toByteArray = b64ToByteArray; - module.exports.fromByteArray = uint8ToBase64; -}()); - + module.exports.toByteArray = b64ToByteArray + module.exports.fromByteArray = uint8ToBase64 +}())