scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-03-06 12:43:06 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix file preview not showing in modal when processing is done

Browse source 
Close SCI-3587
This commit is contained in:
Jure Grabnar 2019-07-08 12:45:22 +02:00
parent 20134c9f8a
commit 0ee0b1c834
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/sitewide/file_preview.js
View file

@ -509,7 +509,7 @@ var FilePreviewModal = (function() {
}, CHECK_READY_DELAY); }, CHECK_READY_DELAY);
} }
} else { } else {
if (data.type === 'image') { if (data.type === 'image' || (data.type === 'file' && data['preview-icon'])) {
modal.find('.file-preview-container').empty(); modal.find('.file-preview-container').empty();
modal.find('.file-preview-container') modal.find('.file-preview-container')
.append($('<img>') .append($('<img>')

1
app/controllers/assets_controller.rb
View file

@ -76,6 +76,7 @@ class AssetsController < ApplicationController
) )
else else
response_json['processing'] = @asset.file.processing? response_json['processing'] = @asset.file.processing?
response_json['large-preview-url'] = @asset.url(:large)
response_json['preview-icon'] = render_to_string( response_json['preview-icon'] = render_to_string(
partial: 'shared/file_preview_icon.html.erb', partial: 'shared/file_preview_icon.html.erb',
locals: { asset: @asset } locals: { asset: @asset }