Commit 97ccea8e authored by Tristan Cavelier's avatar Tristan Cavelier

Merge remote-tracking branch 's3/master' -> s3storage.js

parents 0f5db310 fef0995d
/*jslint indent: 2, maxlen: 80, sloppy: true, nomen: true */ /*jslint indent: 2, maxlen: 80, nomen: true */
/*global define, jIO, btoa, b64_hmac_sha1, jQuery, XMLHttpRequest, XHRwrapper, /*global define, jIO, btoa, b64_hmac_sha1, jQuery, XMLHttpRequest, XHRwrapper,
FormData*/ FormData*/
/** /**
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
} }
module(jIO, jQuery, {b64_hmac_sha1: b64_hmac_sha1}); module(jIO, jQuery, {b64_hmac_sha1: b64_hmac_sha1});
}(['jio', 'jquery', 'sha1'], function (jIO, $, sha1) { }(['jio', 'jquery', 'sha1'], function (jIO, $, sha1) {
"use strict";
var b64_hmac_sha1 = sha1.b64_hmac_sha1; var b64_hmac_sha1 = sha1.b64_hmac_sha1;
jIO.addStorageType("s3", function (spec, my) { jIO.addStorageType("s3", function (spec, my) {
...@@ -968,7 +969,7 @@ ...@@ -968,7 +969,7 @@
//'x-amz-security-token' : , //'x-amz-security-token' : ,
}, },
success : dealCallback(i, countB, allDocResponse), success : dealCallback(i, countB, allDocResponse),
error : errCallback(this) error : errCallback(that.error)
}); });
countB += 1; countB += 1;
} }
......
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