diff options
author | Matthew Somerville <matthew@mysociety.org> | 2016-04-20 15:32:00 +0100 |
---|---|---|
committer | Matthew Somerville <matthew@mysociety.org> | 2016-04-20 15:32:00 +0100 |
commit | 193697bde57ef2cfd0a46bb5a85fa98727378297 (patch) | |
tree | e8dd78b7202b78e3483ac65924e054a23127a594 /web | |
parent | f35b7eba0db02d16fa0aad5a78ee479165217e20 (diff) | |
parent | b7099e8e513fe64ec183b1403515f46a7cc25f19 (diff) |
Merge remote-tracking branch 'origin/1302-support-pngs'
Diffstat (limited to 'web')
-rw-r--r-- | web/cobrands/fixmystreet/fixmystreet.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index 4de18be9a..5935d2bae 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -206,7 +206,7 @@ $(function(){ addRemoveLinks: true, thumbnailHeight: 150, thumbnailWidth: 150, - acceptedFiles: 'image/jpeg,image/pjpeg', + acceptedFiles: 'image/jpeg,image/pjpeg,image/gif,image/tiff,image/png', dictDefaultMessage: translation_strings.upload_default_message, dictCancelUploadConfirmation: translation_strings.upload_cancel_confirmation, dictInvalidFileType: translation_strings.upload_invalid_file_type, @@ -258,7 +258,7 @@ $(function(){ } var mockFile = { name: f, server_id: f }; photodrop.emit("addedfile", mockFile); - photodrop.createThumbnailFromUrl(mockFile, '/photo/' + f + '.temp.jpeg'); + photodrop.createThumbnailFromUrl(mockFile, '/photo/temp.' + f); photodrop.emit("complete", mockFile); photodrop.options.maxFiles -= 1; }); |