scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-22 14:54:38 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #517 from ZmagoD/zd_SCI_1110

Browse source 
fixed wopi buttons [fixes SCI-1110]
This commit is contained in:
Zmago Devetak 2017-03-17 16:50:24 +01:00 committed by GitHub
commit 9a75411cbd
3 changed files with 28 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/assets/javascripts/assets.js
View file

@ -19,6 +19,7 @@ function setupAssetsLoading() {
type: "GET", type: "GET",
dataType: "json", dataType: "json",
success: function (data) { success: function (data) {
var wopiBtns;
$el.attr("data-status", "asset-loaded"); $el.attr("data-status", "asset-loaded");
$el.find('img').hide(); $el.find('img').hide();
$el.next().hide(); $el.next().hide();
@ -33,10 +34,16 @@ function setupAssetsLoading() {
data['preview-url'] + "'><p>" + data['preview-url'] + "'><p>" +
data.filename + '</p></a>' data.filename + '</p></a>'
); );
} else if(data.type === "wopi") { } else if (data.type === 'wopi') {
$el.html(data['wopi-file-name'] + if (data['wopi-edit']) {
data['wopi-view'] + wopiBtns = data['wopi-file-name'] +
data['wopi-edit']); data['wopi-view'] +
data['wopi-edit'];
} else {
wopiBtns = data['wopi-file-name'] +
data['wopi-view'];
}
$el.html(wopiBtns);
} else { } else {
$el.html( $el.html(
"<a href='" + data['download-url'] + "'><p>" + "<a href='" + data['download-url'] + "'><p>" +

2
app/controllers/assets_controller.rb
View file

@ -60,7 +60,7 @@ class AssetsController < ApplicationController
Constants::FILENAME_TRUNCATION_LENGTH), Constants::FILENAME_TRUNCATION_LENGTH),
'download-url' => download_asset_path(@asset), 'download-url' => download_asset_path(@asset),
'type' => asset_data_type(@asset), 'type' => asset_data_type(@asset),
'wopi-file-name' => wopi_asset_file_name(@asset), 'wopi-file-name' => wopi_asset_file_name(@asset, true),
'wopi-edit' => (wopi_asset_edit_button(@asset) if wopi_file?(@asset)), 'wopi-edit' => (wopi_asset_edit_button(@asset) if wopi_file?(@asset)),
'wopi-view' => (wopi_asset_view_button(@asset) if wopi_file?(@asset)) 'wopi-view' => (wopi_asset_view_button(@asset) if wopi_file?(@asset))
}, status: 200 }, status: 200

20
app/helpers/wopi_helper.rb
View file

@ -51,12 +51,24 @@ module WopiHelper
end end
end end
def wopi_asset_file_name(asset) def wopi_asset_file_name(asset, link = false)
html = '<p style="display: inline-block">' html = '<p style="display: inline-block">'
html += "#{file_extension_icon(asset)}&nbsp;" html += "#{file_extension_icon(asset)}&nbsp;"
html += truncate(asset.file_file_name, if link
length: Constants::FILENAME_TRUNCATION_LENGTH) html += link_to download_asset_path(asset),
data: { no_turbolink: true,
id: true,
status: 'asset-present' } do
truncate(
asset.file_file_name,
length: Constants::FILENAME_TRUNCATION_LENGTH
)
end
else
html += truncate(asset.file_file_name,
length: Constants::FILENAME_TRUNCATION_LENGTH)
end
html += '&nbsp;</p>' html += '&nbsp;</p>'
sanitize_input(html, %w(img)) sanitize_input(html, %w(img a))
end end
end end