scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 23:16:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #934 from okriuchykhin/ok_SCI_1931

Browse source 
Fix protocol import button [SCI-1931]
This commit is contained in:
okriuchykhin 2018-01-18 10:30:19 +01:00 committed by GitHub
parent 9fd1f81f20 deabd39a98
commit aef80f86b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/my_modules/protocols.js.erb
View file

@ -474,7 +474,7 @@ function initImport() {
});
// Hack to hide "No file chosen" tooltip
fileInput.attr("title", window.webkitURL ? " " : "");
fileInput.attr("title", window.URL ? " " : "");
fileInput.on("change", function(ev) {
var importUrl = fileInput.attr("data-import-url");

2
app/views/my_modules/protocols/_protocol_buttons.html.erb
View file

@ -15,7 +15,7 @@
<li>
<a class="btn-open-file" href="#" data-action="load-from-file" data-import-url="<%= load_from_file_protocol_path(@protocol, format: :json) %>">
<span class="glyphicon glyphicon-file"></span>&nbsp;<%= t("my_modules.protocols.buttons.load_protocol_from_file") %>
<input type="file" value="" accept=".eln">
<input type="file" value="" accept=".eln" data-turbolinks="false">
</a>
</li>
<% else %>