fix(attachments): Only preview images up to 5MB, not 10MB

This commit is contained in:
Ben Gotow 2015-11-24 16:16:58 -08:00
parent 651a82287b
commit a82ebba618
4 changed files with 8 additions and 7 deletions

View file

@ -151,7 +151,7 @@ class ComposerView extends React.Component
_preloadImages: (files=[]) ->
files.forEach (file) ->
uploadData = FileUploadStore.linkedUpload(file)
if not uploadData? and Utils.looksLikeImage(file)
if not uploadData? and Utils.shouldDisplayAsImage(file)
Actions.fetchFile(file)
_teardownForDraft: =>
@ -399,10 +399,10 @@ class ComposerView extends React.Component
return sortOrder
_images: ->
_.sortBy _.filter(@_uploadsAndFiles(), Utils.looksLikeImage), @_fileSort
_.sortBy _.filter(@_uploadsAndFiles(), Utils.shouldDisplayAsImage), @_fileSort
_nonImages: ->
_.sortBy _.reject(@_uploadsAndFiles(), Utils.looksLikeImage), @_fileSort
_.sortBy _.reject(@_uploadsAndFiles(), Utils.shouldDisplayAsImage), @_fileSort
_uploadsAndFiles: ->
# When uploads finish, they stay attached to the object at 100%

View file

@ -201,7 +201,7 @@ class MessageItem extends React.Component
for file in (@props.message.files ? [])
continue unless @_isRealFile(file)
if Utils.looksLikeImage(file)
if Utils.shouldDisplayAsImage(file)
imageAttachments.push(file)
else
otherAttachments.push(file)

View file

@ -155,6 +155,7 @@ describe "ThreadCountsStore", ->
advanceClock()
@countResolve(4)
advanceClock()
advanceClock(10001)
expect(ThreadCountsStore._fetchCountsMissing).toHaveBeenCalled()
describe "when deltas appear during a count", ->

View file

@ -89,14 +89,14 @@ Utils =
return set
# Given a File object or uploadData of an uploading file object,
# determine if it looks like an image
looksLikeImage: (file={}) ->
# determine if it looks like an image and is in the size range for previews
shouldDisplayAsImage: (file={}) ->
name = file.filename ? file.fileName ? file.name ? ""
size = file.size ? file.fileSize ? 0
ext = path.extname(name).toLowerCase()
extensions = ['.jpg', '.bmp', '.gif', '.png', '.jpeg']
return ext in extensions and size > 512 and size < 1024*1024*10
return ext in extensions and size > 512 and size < 1024*1024*5
looksLikeGmailInvite: (message={}) ->