diff options
| author | rr- <rr-@sakuya.pl> | 2017-01-07 12:33:17 +0100 |
|---|---|---|
| committer | rr- <rr-@sakuya.pl> | 2017-01-08 10:25:29 +0100 |
| commit | be6f8d7f465dd75932b77e5f8d6a7a18209ded8b (patch) | |
| tree | 9160e7c866390f6e92bed559f43b6311204e581e /client/js/controllers/post_upload_controller.js | |
| parent | 036fa9ee3908f480b9e0f8aa3018bf7c8768e88f (diff) | |
client/api: merge URL and Blob based file uploads
Diffstat (limited to 'client/js/controllers/post_upload_controller.js')
| -rw-r--r-- | client/js/controllers/post_upload_controller.js | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/client/js/controllers/post_upload_controller.js b/client/js/controllers/post_upload_controller.js index ca40741..a605a42 100644 --- a/client/js/controllers/post_upload_controller.js +++ b/client/js/controllers/post_upload_controller.js @@ -85,9 +85,8 @@ class PostUploadController { let reverseSearchPromise = Promise.resolve(); if (!uploadable.lookalikesConfirmed && ['image'].includes(uploadable.type)) { - reverseSearchPromise = uploadable.url ? - Post.reverseSearchFromUrl(uploadable.url) : - Post.reverseSearchFromFile(uploadable.file); + reverseSearchPromise = + Post.reverseSearch(uploadable.url || uploadable.file); } this._lastCancellablePromise = reverseSearchPromise; @@ -140,11 +139,7 @@ class PostUploadController { post.flags = uploadable.flags; post.tags = uploadable.tags; post.relations = uploadable.relations; - if (uploadable.url) { - post.newContentUrl = uploadable.url; - } else { - post.newContent = uploadable.file; - } + post.newContent = uploadable.url || uploadable.file; return post; } } |