Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed file uploading in new ticket.

Browse source
This commit is contained in:
Martin Edenhofer 2015-10-06 11:39:44 +02:00
parent 35235b7653
commit c66c61404b
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/assets/javascripts/app/controllers/_ui_element/richtext.coffee
View file

@ -13,7 +13,7 @@ class App.UiElement.richtext
renderAttachment = (file) => renderAttachment = (file) =>
item.find('.attachments').append( App.view('generic/attachment_item')( item.find('.attachments').append( App.view('generic/attachment_item')(
fileName: file.filename fileName: file.filename
fileSize: @humanFileSize( file.size ) fileSize: App.Utils.humanFileSize( file.size )
store_id: file.store_id store_id: file.store_id
)) ))
item.on( item.on(
@ -82,7 +82,12 @@ class App.UiElement.richtext
@attachmentPlaceholder.removeClass('hide') @attachmentPlaceholder.removeClass('hide')
@attachmentUpload.addClass('hide') @attachmentUpload.addClass('hide')
# reset progress bar
@progressBar.width(parseInt(0) + '%')
@progressText.text('')
renderAttachment(response.data) renderAttachment(response.data)
console.log('upload complete', response.data ) console.log('upload complete', response.data )
# Called during upload progress, first parameter # Called during upload progress, first parameter

4
app/assets/javascripts/app/controllers/ticket_zoom/article_new.coffee
View file

@ -196,6 +196,10 @@ class App.TicketZoomArticleNew extends App.Controller
@attachmentPlaceholder.removeClass('hide') @attachmentPlaceholder.removeClass('hide')
@attachmentUpload.addClass('hide') @attachmentUpload.addClass('hide')
# reset progress bar
@progressBar.width(parseInt(0) + '%')
@progressText.text('')
@renderAttachment(response.data) @renderAttachment(response.data)
console.log('upload complete', response.data ) console.log('upload complete', response.data )