Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jio-main
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Hardik Juneja
jio-main
Commits
97ccea8e
Commit
97ccea8e
authored
Aug 21, 2013
by
Tristan Cavelier
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 's3/master' -> s3storage.js
parents
0f5db310
fef0995d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
src/jio.storage/s3storage.js
src/jio.storage/s3storage.js
+3
-2
No files found.
src/jio.storage/s3storage.js
View file @
97ccea8e
/*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
(
th
is
)
error
:
errCallback
(
th
at
.
error
)
});
});
countB
+=
1
;
countB
+=
1
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment