Skip to content

J
jio
Commit a3c59627 authored by Sven Franck's avatar Sven Franck
Browse files
Options

replaced base64 dependencies with btoa

parent 33f6cd32
Show whitespace changes
Inline Side-by-side
Showing with 27 additions and 172 deletions
lib/base64/base64.js deleted 100644 → 0
View file @ 33f6cd32
/**
*
* Base64 encode / decode
* http://www.webtoolkit.info/
*
**/
var Base64 = {
// private property
_keyStr : "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",
// public method for encoding
encode : function (input) {
var output = "";
var chr1, chr2, chr3, enc1, enc2, enc3, enc4;
var i = 0;
input = Base64._utf8_encode(input);
while (i < input.length) {
chr1 = input.charCodeAt(i++);
chr2 = input.charCodeAt(i++);
chr3 = input.charCodeAt(i++);
enc1 = chr1 >> 2;
enc2 = ((chr1 & 3) << 4) | (chr2 >> 4);
enc3 = ((chr2 & 15) << 2) | (chr3 >> 6);
enc4 = chr3 & 63;
if (isNaN(chr2)) {
enc3 = enc4 = 64;
} else if (isNaN(chr3)) {
enc4 = 64;
}
output = output +
this._keyStr.charAt(enc1) + this._keyStr.charAt(enc2) +
this._keyStr.charAt(enc3) + this._keyStr.charAt(enc4);
}
return output;
},
// public method for decoding
decode : function (input) {
var output = "";
var chr1, chr2, chr3;
var enc1, enc2, enc3, enc4;
var i = 0;
input = input.replace(/[^A-Za-z0-9\+\/\=]/g, "");
while (i < input.length) {
enc1 = this._keyStr.indexOf(input.charAt(i++));
enc2 = this._keyStr.indexOf(input.charAt(i++));
enc3 = this._keyStr.indexOf(input.charAt(i++));
enc4 = this._keyStr.indexOf(input.charAt(i++));
chr1 = (enc1 << 2) | (enc2 >> 4);
chr2 = ((enc2 & 15) << 4) | (enc3 >> 2);
chr3 = ((enc3 & 3) << 6) | enc4;
output = output + String.fromCharCode(chr1);
if (enc3 != 64) {
output = output + String.fromCharCode(chr2);
}
if (enc4 != 64) {
output = output + String.fromCharCode(chr3);
}
}
output = Base64._utf8_decode(output);
return output;
},
// private method for UTF-8 encoding
_utf8_encode : function (string) {
string = string.replace(/\r\n/g,"\n");
var utftext = "";
for (var n = 0; n < string.length; n++) {
var c = string.charCodeAt(n);
if (c < 128) {
utftext += String.fromCharCode(c);
}
else if((c > 127) && (c < 2048)) {
utftext += String.fromCharCode((c >> 6) | 192);
utftext += String.fromCharCode((c & 63) | 128);
}
else {
utftext += String.fromCharCode((c >> 12) | 224);
utftext += String.fromCharCode(((c >> 6) & 63) | 128);
utftext += String.fromCharCode((c & 63) | 128);
}
}
return utftext;
},
// private method for UTF-8 decoding
_utf8_decode : function (utftext) {
var string = "";
var i = 0;
var c = c1 = c2 = 0;
while ( i < utftext.length ) {
c = utftext.charCodeAt(i);
if (c < 128) {
string += String.fromCharCode(c);
i++;
}
else if((c > 191) && (c < 224)) {
c2 = utftext.charCodeAt(i+1);
string += String.fromCharCode(((c & 31) << 6) | (c2 & 63));
i += 2;
}
else {
c2 = utftext.charCodeAt(i+1);
c3 = utftext.charCodeAt(i+2);
string += String.fromCharCode(((c & 15) << 12) | ((c2 & 63) << 6) | (c3 & 63));
i += 3;
}
}
return string;
}
}
src/jio.storage/davstorage.js
View file @ a3c59627
/*jslint indent: 2, maxlen: 80, sloppy: true, nomen: true */ /*jslint indent: 2, maxlen: 80, sloppy: true, nomen: true */
/*global jIO: true, $: true, Base64: true */ /*global jIO: true, $: true, btoa: true */
// test here: http://enable-cors.org/ // test here: http://enable-cors.org/
//http://metajack.im/2010/01/19/crossdomain-ajax-for-xmpp-http-binding-made-easy //http://metajack.im/2010/01/19/crossdomain-ajax-for-xmpp-http-binding-made-easy
jIO.addStorageType('dav', function (spec, my) { jIO.addStorageType('dav', function (spec, my) {
...@@ -177,7 +177,7 @@ jIO.addStorageType('dav', function (spec, my) { ...@@ -177,7 +177,7 @@ jIO.addStorageType('dav', function (spec, my) {
dataType: 'text', dataType: 'text',
crossdomain : true, crossdomain : true,
headers : { headers : {
Authorization: 'Basic ' + Base64.encode( Authorization: 'Basic ' + btoa(
priv.username + ':' + priv.password priv.username + ':' + priv.password
) )
}, },
...@@ -202,7 +202,7 @@ jIO.addStorageType('dav', function (spec, my) { ...@@ -202,7 +202,7 @@ jIO.addStorageType('dav', function (spec, my) {
async: true, async: true,
crossdomain: true, crossdomain: true,
headers : { headers : {
Authorization: 'Basic ' + Base64.encode( Authorization: 'Basic ' + btoa(
priv.username + ':' + priv.password priv.username + ':' + priv.password
) )
}, },
...@@ -234,7 +234,7 @@ jIO.addStorageType('dav', function (spec, my) { ...@@ -234,7 +234,7 @@ jIO.addStorageType('dav', function (spec, my) {
async: true, async: true,
crossdomain: true, crossdomain: true,
headers : { headers : {
Authorization: 'Basic ' + Base64.encode( Authorization: 'Basic ' + btoa(
priv.username + ':' + priv.password priv.username + ':' + priv.password
) )
}, },
...@@ -335,7 +335,7 @@ jIO.addStorageType('dav', function (spec, my) { ...@@ -335,7 +335,7 @@ jIO.addStorageType('dav', function (spec, my) {
dataType: 'text', dataType: 'text',
crossdomain : true, crossdomain : true,
headers : { headers : {
Authorization: 'Basic ' + Base64.encode( Authorization: 'Basic ' + btoa(
priv.username + ':' + priv.password priv.username + ':' + priv.password
) )
}, },
...@@ -357,7 +357,7 @@ jIO.addStorageType('dav', function (spec, my) { ...@@ -357,7 +357,7 @@ jIO.addStorageType('dav', function (spec, my) {
async: true, async: true,
crossdomain: true, crossdomain: true,
headers : { headers : {
Authorization: 'Basic ' + Base64.encode( Authorization: 'Basic ' + btoa(
priv.username + ':' + priv.password priv.username + ':' + priv.password
) )
}, },
...@@ -373,7 +373,7 @@ jIO.addStorageType('dav', function (spec, my) { ...@@ -373,7 +373,7 @@ jIO.addStorageType('dav', function (spec, my) {
async: true, async: true,
crossdomain: true, crossdomain: true,
headers : { headers : {
Authorization: 'Basic ' + Base64.encode( Authorization: 'Basic ' + btoa(
priv.username + ':' + priv.password priv.username + ':' + priv.password
) )
}, },
...@@ -474,7 +474,7 @@ jIO.addStorageType('dav', function (spec, my) { ...@@ -474,7 +474,7 @@ jIO.addStorageType('dav', function (spec, my) {
dataType: 'text', dataType: 'text',
crossdomain : true, crossdomain : true,
headers : { headers : {
Authorization: 'Basic ' + Base64.encode( Authorization: 'Basic ' + btoa(
priv.username + ':' + priv.password priv.username + ':' + priv.password
) )
}, },
...@@ -502,7 +502,7 @@ jIO.addStorageType('dav', function (spec, my) { ...@@ -502,7 +502,7 @@ jIO.addStorageType('dav', function (spec, my) {
dataType: 'text', dataType: 'text',
crossdomain : true, crossdomain : true,
headers : { headers : {
Authorization: 'Basic ' + Base64.encode( Authorization: 'Basic ' + btoa(
priv.username + ':' + priv.password priv.username + ':' + priv.password
) )
}, },
...@@ -573,7 +573,7 @@ jIO.addStorageType('dav', function (spec, my) { ...@@ -573,7 +573,7 @@ jIO.addStorageType('dav', function (spec, my) {
async: true, async: true,
crossdomain : true, crossdomain : true,
headers : { headers : {
Authorization: 'Basic ' + Base64.encode( Authorization: 'Basic ' + btoa(
priv.username + ':' + priv.password priv.username + ':' + priv.password
) )
}, },
...@@ -586,7 +586,7 @@ jIO.addStorageType('dav', function (spec, my) { ...@@ -586,7 +586,7 @@ jIO.addStorageType('dav', function (spec, my) {
dataType: 'text', dataType: 'text',
crossdomain : true, crossdomain : true,
headers : { headers : {
Authorization: 'Basic ' + Base64.encode( Authorization: 'Basic ' + btoa(
priv.username + ':' + priv.password priv.username + ':' + priv.password
) )
}, },
...@@ -610,7 +610,7 @@ jIO.addStorageType('dav', function (spec, my) { ...@@ -610,7 +610,7 @@ jIO.addStorageType('dav', function (spec, my) {
async: true, async: true,
crossdomain: true, crossdomain: true,
headers : { headers : {
Authorization: 'Basic ' + Base64.encode( Authorization: 'Basic ' + btoa(
priv.username + ':' + priv.password priv.username + ':' + priv.password
) )
}, },
...@@ -682,7 +682,7 @@ jIO.addStorageType('dav', function (spec, my) { ...@@ -682,7 +682,7 @@ jIO.addStorageType('dav', function (spec, my) {
dataType: 'text', dataType: 'text',
crossdomain : true, crossdomain : true,
headers : { headers : {
Authorization: 'Basic ' + Base64.encode( Authorization: 'Basic ' + btoa(
priv.username + ':' + priv.password priv.username + ':' + priv.password
) )
}, },
...@@ -705,7 +705,7 @@ jIO.addStorageType('dav', function (spec, my) { ...@@ -705,7 +705,7 @@ jIO.addStorageType('dav', function (spec, my) {
async: true, async: true,
crossdomain : true, crossdomain : true,
headers : { headers : {
Authorization: 'Basic ' + Base64.encode( Authorization: 'Basic ' + btoa(
priv.username + ':' + priv.password priv.username + ':' + priv.password
) )
}, },
...@@ -725,7 +725,7 @@ jIO.addStorageType('dav', function (spec, my) { ...@@ -725,7 +725,7 @@ jIO.addStorageType('dav', function (spec, my) {
async: true, async: true,
crossdomain : true, crossdomain : true,
headers : { headers : {
Authorization: 'Basic ' + Base64.encode( Authorization: 'Basic ' + btoa(
priv.username + ':' + priv.password priv.username + ':' + priv.password
) )
}, },
...@@ -816,7 +816,7 @@ jIO.addStorageType('dav', function (spec, my) { ...@@ -816,7 +816,7 @@ jIO.addStorageType('dav', function (spec, my) {
async: true, async: true,
dataType: 'text', dataType: 'text',
headers: { headers: {
'Authorization': 'Basic ' + Base64.encode( 'Authorization': 'Basic ' + btoa(
priv.username + ':' + priv.password priv.username + ':' + priv.password
) )
}, },
...@@ -847,7 +847,7 @@ jIO.addStorageType('dav', function (spec, my) { ...@@ -847,7 +847,7 @@ jIO.addStorageType('dav', function (spec, my) {
dataType: "xml", dataType: "xml",
crossdomain : true, crossdomain : true,
headers : { headers : {
Authorization: 'Basic ' + Base64.encode( Authorization: 'Basic ' + btoa(
priv.username + ':' + priv.password priv.username + ':' + priv.password
), ),
Depth: '1' Depth: '1'
......
src/jio.storage/xwikistorage.js
View file @ a3c59627
/*jslint indent: 2, maxlen: 80, sloppy: true, nomen: true */ /*jslint indent: 2, maxlen: 80, sloppy: true, nomen: true */
/*global toSend: true, jIO: true, jQuery: true, Base64: true */ /*global toSend: true, jIO: true, jQuery: true, btoa: true */
/** /**
* JIO XWiki based storage. Type = 'xwiki'. * JIO XWiki based storage. Type = 'xwiki'.
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
.1:8080/xwiki","space":"OfficeJS"} .1:8080/xwiki","space":"OfficeJS"}
*/ */
(function ($, Base64) { (function ($) {
var newXWikiStorage = function (spec, my) { var newXWikiStorage = function (spec, my) {
var that, priv, escapeDocId, restoreDocId, var that, priv, escapeDocId, restoreDocId,
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
async: true, async: true,
dataType: 'text', dataType: 'text',
headers: { headers: {
'Authorization': 'Basic ' + Base64.encode(priv.username + ':' + 'Authorization': 'Basic ' + btoa(priv.username + ':' +
priv.password) priv.password)
}, },
success: function (html) { success: function (html) {
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
async: true, async: true,
dataType: 'xml', dataType: 'xml',
headers: { headers: {
'Authorization': 'Basic ' + Base64.encode(priv.username + ':' + 'Authorization': 'Basic ' + btoa(priv.username + ':' +
priv.password) priv.password)
}, },
success: function (xmlData) { success: function (xmlData) {
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
async: true, async: true,
dataType: 'text', dataType: 'text',
headers: { headers: {
'Authorization': 'Basic ' + Base64.encode(priv.username + ':' + 'Authorization': 'Basic ' + btoa(priv.username + ':' +
priv.password) priv.password)
}, },
data: { data: {
...@@ -202,7 +202,7 @@ ...@@ -202,7 +202,7 @@
async: true, async: true,
dataType: 'text', dataType: 'text',
headers: { headers: {
'Authorization': 'Basic ' + Base64.encode(priv.username + ':' + 'Authorization': 'Basic ' + btoa(priv.username + ':' +
priv.password) priv.password)
}, },
success: function (html) { success: function (html) {
...@@ -230,7 +230,7 @@ ...@@ -230,7 +230,7 @@
async: true, async: true,
dataType: 'xml', dataType: 'xml',
headers: { headers: {
'Authorization': 'Basic ' + Base64.encode(priv.username + ':' + 'Authorization': 'Basic ' + btoa(priv.username + ':' +
priv.password) priv.password)
}, },
success: function (xmlData) { success: function (xmlData) {
...@@ -319,7 +319,7 @@ ...@@ -319,7 +319,7 @@
async: true, async: true,
dataType: 'text', dataType: 'text',
headers: { headers: {
'Authorization': 'Basic ' + Base64.encode(priv.username + ':' + 'Authorization': 'Basic ' + btoa(priv.username + ':' +
priv.password) priv.password)
}, },
data: { data: {
...@@ -338,4 +338,4 @@ ...@@ -338,4 +338,4 @@
return that; return that;
}; };
jIO.addStorageType('xwiki', newXWikiStorage); jIO.addStorageType('xwiki', newXWikiStorage);
}(jQuery, Base64)); }(jQuery));
test/jiotests.js
View file @ a3c59627
...@@ -3734,8 +3734,6 @@ if (window.requirejs) { ...@@ -3734,8 +3734,6 @@ if (window.requirejs) {
jQueryAPI: '../lib/jquery/jquery', jQueryAPI: '../lib/jquery/jquery',
jQuery: '../js/jquery.requirejs_module', jQuery: '../js/jquery.requirejs_module',
JIO: '../src/jio', JIO: '../src/jio',
Base64API: '../lib/base64/base64',
Base64: '../js/base64.requirejs_module',
JIODummyStorages: '../src/jio.dummystorages', JIODummyStorages: '../src/jio.dummystorages',
JIOStorages: '../src/jio.storage', JIOStorages: '../src/jio.storage',
SJCLAPI:'../lib/sjcl/sjcl.min', SJCLAPI:'../lib/sjcl/sjcl.min',
......
test/jiotests_withoutrequirejs.html
View file @ a3c59627
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
<!-- webDav --> <!-- webDav -->
<script type="text/javascript" src="../lib/jquery/jquery.min.js"></script> <script type="text/javascript" src="../lib/jquery/jquery.min.js"></script>
<script type="text/javascript" src="../lib/base64/base64.js"></script>
<script type="text/javascript" src="../src/jio.storage/davstorage.js"> <script type="text/javascript" src="../src/jio.storage/davstorage.js">
</script> </script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7