aboutsummaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorMatthew Somerville <matthew-github@dracos.co.uk>2016-04-08 21:11:48 +0100
committerMatthew Somerville <matthew-github@dracos.co.uk>2016-04-08 22:05:21 +0100
commitb7099e8e513fe64ec183b1403515f46a7cc25f19 (patch)
tree8a0399a49f90acfe5b74cf19d86585cc050455d7 /web
parent0802b7f04091c1022dce0d77cc806a46ecc4ebba (diff)
Add PNG image support.
Store image type along with hash in photo column, and use that when outputting images / generating URLs. Make sure all public photo URL generation goes through appropriate functions, and change temp URLs so the filename can be output directly from the list.
Diffstat (limited to 'web')
-rw-r--r--web/cobrands/fixmystreet/fixmystreet.js4
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;
});