Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-10-06 19:26:55 +08:00
Code Issues Projects Releases Packages Wiki Activity

Misc fixes for FileUploadStore

Browse source
This commit is contained in:
Juan Tejada 2016-01-27 15:38:01 -08:00
parent 08ec481739
commit 1d8f56e7f8
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
internal_packages/composer/lib/composer-view.cjsx
View file

@ -70,7 +70,7 @@ class ComposerView extends React.Component
focusedField: Fields.To # Gets updated in @_initiallyFocusedField focusedField: Fields.To # Gets updated in @_initiallyFocusedField
enabledFields: [] # Gets updated in @_initiallyEnabledFields enabledFields: [] # Gets updated in @_initiallyEnabledFields
showQuotedText: false showQuotedText: false
uploads: FileUploadStore.uploadsForMessage(@props.draftClientId) ? [] uploads: FileUploadStore.uploadsForMessage(@props.draftClientId)
componentWillMount: => componentWillMount: =>
@_prepareForDraft(@props.draftClientId) @_prepareForDraft(@props.draftClientId)
@ -506,7 +506,7 @@ class ComposerView extends React.Component
files: draft.files files: draft.files
subject: draft.subject subject: draft.subject
accounts: @_getAccountsForSend() accounts: @_getAccountsForSend()
uploads: FileUploadStore.uploadsForMessage(@props.draftClientId) ? [] uploads: FileUploadStore.uploadsForMessage(@props.draftClientId)
if !@state.populated if !@state.populated
_.extend state, _.extend state,

3
internal_packages/composer/lib/file-upload.cjsx
View file

@ -26,7 +26,8 @@ class FileUpload extends React.Component
</div> </div>
</div> </div>
_onClickRemove: => _onClickRemove: (event) =>
event.preventDefault()
Actions.removeAttachment @props.upload Actions.removeAttachment @props.upload
_extension: => _extension: =>

5
src/flux/stores/file-upload-store.coffee
View file

@ -36,12 +36,13 @@ class FileUploadStore extends NylasStore
@_fileUploads = @_getFileUploadsFromFs() @_fileUploads = @_getFileUploadsFromFs()
uploadsForMessage: (messageClientId) -> uploadsForMessage: (messageClientId) ->
@_fileUploads[messageClientId] ? [] [].concat(@_fileUploads[messageClientId] ? [])
# Handlers # Handlers
_onDataChanged: (change) => _onDataChanged: (change) =>
return unless NylasEnv.isMainWindow()
return unless change.objectClass is Message.name and change.type is 'unpersist' return unless change.objectClass is Message.name and change.type is 'unpersist'
change.objects.forEach (message) => change.objects.forEach (message) =>
uploads = @_fileUploads[message.clientId] uploads = @_fileUploads[message.clientId]
@ -164,7 +165,7 @@ class FileUploadStore extends NylasStore
fs.unlink upload.targetPath, (err) -> fs.unlink upload.targetPath, (err) ->
reject("Error removing file #{upload.filename}") if err reject("Error removing file #{upload.filename}") if err
fs.rmdir upload.targetDir, (err) -> fs.rmdir upload.targetDir, (err) ->
reject("Error removing file #{upload.filename}") if err reject("Error removing directory for file #{upload.filename}") if err
resolve(upload) resolve(upload)
_saveUpload: (upload) => _saveUpload: (upload) =>