diff options
| author | mo khan <mo@mokhan.ca> | 2014-07-05 21:42:29 -0600 |
|---|---|---|
| committer | mo khan <mo@mokhan.ca> | 2014-07-05 21:42:29 -0600 |
| commit | de1c35771c70caae026329a10c8faf94babb2541 (patch) | |
| tree | 1f67a56d1eef593910404370265cbddd3b1c7f05 /app/assets/javascripts | |
| parent | a0ad30afc7d5f1a108acb499b64b6ccd8a0ef067 (diff) | |
display the image from the local filesystem while it is being uploaded.
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/backbone/templates/cakes/thumbnail.jst.ejs | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/backbone/views/photos/new_modal_view.js.coffee | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/javascripts/backbone/templates/cakes/thumbnail.jst.ejs b/app/assets/javascripts/backbone/templates/cakes/thumbnail.jst.ejs index a5483c3c..d1d96d55 100644 --- a/app/assets/javascripts/backbone/templates/cakes/thumbnail.jst.ejs +++ b/app/assets/javascripts/backbone/templates/cakes/thumbnail.jst.ejs @@ -1,5 +1,6 @@ <li class="span2"> <% if (uploading()) { %> + <img src="<%= thumb_url %>" class="thumbnail" /> <div class="progress progress-striped active"> <div class="bar" style="width: <%= percentComplete %>%;"></div> </div> diff --git a/app/assets/javascripts/backbone/views/photos/new_modal_view.js.coffee b/app/assets/javascripts/backbone/views/photos/new_modal_view.js.coffee index 56835448..777b6ccb 100644 --- a/app/assets/javascripts/backbone/views/photos/new_modal_view.js.coffee +++ b/app/assets/javascripts/backbone/views/photos/new_modal_view.js.coffee @@ -37,6 +37,7 @@ class CakeSide.Views.Photos.NewModalView extends Marionette.ItemView $('#preview-image').removeClass('hide') reader.readAsDataURL(file) @model.set('image', file) + @model.set('thumb_url', e.target.result) else $('#preview-image').addClass('hide') |