Skip to content

Commit 9050c5c

Browse files
authored
Merge pull request #173 from bradleyg/digital-ocean-support
Cleanup.
2 parents bcfb1ac + 81041e9 commit 9050c5c

File tree

4 files changed

+15
-6
lines changed

4 files changed

+15
-6
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ npm-debug.log
1414
.tox/
1515
.env
1616
.cache
17+
settings.json

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "django-s3direct",
3-
"version": "1.1.0",
3+
"version": "1.1.1",
44
"description": "Add direct uploads to S3 functionality with a progress bar to file input fields.",
55
"directories": {
66
"example": "example"

s3direct/static/s3direct/dist/index.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/index.js

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -179,10 +179,6 @@ const initiateUpload = (element, signingUrl, uploadParameters, file, dest) => {
179179
uploadParameters.server_side_encryption,
180180
uploadParameters.session_token
181181
),
182-
notSignedHeadersAtInitiate: {
183-
'Cache-Control': uploadParameters.cache_control,
184-
'Content-Disposition': uploadParameters.content_disposition
185-
},
186182
progress: (progressRatio, stats) => {
187183
updateProgressBar(element, progressRatio);
188184
},
@@ -193,6 +189,18 @@ const initiateUpload = (element, signingUrl, uploadParameters, file, dest) => {
193189
}
194190
};
195191

192+
const optHeaders = {}
193+
194+
if(uploadParameters.cache_control) {
195+
optHeaders['Cache-Control'] = uploadParameters.cache_control
196+
}
197+
198+
if(uploadParameters.content_disposition) {
199+
optHeaders['Content-Disposition'] = uploadParameters.content_disposition
200+
}
201+
202+
addConfig['notSignedHeadersAtInitiate'] = optHeaders
203+
196204
Evaporate
197205
.create(createConfig)
198206
.then(

0 commit comments

Comments
 (0)