ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2025-02-14 21:10:27 +01:00
Code Issues Releases Wiki Activity

use standard promises instead of fineuploaders'

Browse Source
This commit is contained in:
Tim Daubenschütz 2015-07-27 09:28:50 +02:00
parent d71111b6f1
commit 5da577caca
1 changed files with 57 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
js/components/ascribe_uploader/react_s3_fine_uploader.js
View File

@ -221,10 +221,10 @@ var ReactS3FineUploader = React.createClass({
}, },
requestKey(fileId) { requestKey(fileId) {
let defer = new fineUploader.Promise();
let filename = this.state.uploader.getName(fileId); let filename = this.state.uploader.getName(fileId);
let uuid = this.state.uploader.getUuid(fileId); let uuid = this.state.uploader.getUuid(fileId);
return Q.Promise((resolve, reject) => {
window.fetch(this.props.keyRoutine.url, { window.fetch(this.props.keyRoutine.url, {
method: 'post', method: 'post',
headers: { headers: {
@ -244,18 +244,16 @@ var ReactS3FineUploader = React.createClass({
return res.json(); return res.json();
}) })
.then((res) =>{ .then((res) =>{
defer.success(res.key); resolve(res.key);
}) })
.catch((err) => { .catch((err) => {
defer.failure(err); reject(err);
});
}); });
return defer;
}, },
createBlob(file) { createBlob(file) {
let defer = new fineUploader.Promise(); return Q.Promise((resolve, reject) => {
window.fetch(this.props.createBlobRoutine.url, { window.fetch(this.props.createBlobRoutine.url, {
method: 'post', method: 'post',
headers: { headers: {
@ -283,13 +281,13 @@ var ReactS3FineUploader = React.createClass({
} else { } else {
throw new Error(getLangText('Could not find a url to download.')); throw new Error(getLangText('Could not find a url to download.'));
} }
defer.success(res.key); resolve(res.key);
}) })
.catch((err) => { .catch((err) => {
defer.failure(err); reject(err);
console.logGlobal(err); console.logGlobal(err);
}); });
return defer; });
}, },
/* FineUploader specific callback function handlers */ /* FineUploader specific callback function handlers */