scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-27 10:08:11 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix bugs

Browse source
This commit is contained in:
zmagod 2017-01-19 09:40:39 +01:00
parent 88d7cb200e
commit 27d3868f37
3 changed files with 1231 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/sitewide/atwho_res.js.erb
View file

@ -251,7 +251,7 @@ var SmartAnnotation = (function() {
if(atWhoUpdating || (!$(field).length && _.isUndefined(searchFilter))) {
setTimeout(function() {
$(field).atwho('run');
}, 100);
}, 300);
return;
}
@ -259,7 +259,7 @@ var SmartAnnotation = (function() {
setTimeout(function() {
remoteFilterCb();
atWhoUpdating = false;
}, 100);
}, 300);
}
function atWhoSettings(at, defaultSearchFilter) {

20
app/views/steps/_step.html.erb
View file

@ -90,11 +90,15 @@
<div class="col-xs-12">
<% step.checklists.each do |checklist| %>
<strong><%= auto_link(
simple_format(
smart_annotation_parser(checklist.name)
smart_annotation_parser(
simple_format(
checklist.name,
sanitize: false
)
),
link: :urls,
html: { target: '_blank' }) %></strong>
sanitize: false,
html: { target: '_blank' }).html_safe %></strong>
<% if checklist.checklist_items.empty? %>
</br>
<%= t("protocols.steps.empty_checklist") %>
@ -109,11 +113,15 @@
<input type="checkbox" value="" disabled="disabled" />
<% end %>
<%= auto_link(
simple_format(
smart_annotation_parser(checklist_item.text)
smart_annotation_parser(
simple_format(
checklist_item.text,
sanitize: false
)
),
link: :urls,
html: { target: '_blank' }) %>
sanitize: false,
html: { target: '_blank' }).html_safe %>
</label>
</div>
<% end %>

1216
vendor/assets/javascripts/jquery.atwho.min.js vendored
View file

File diff suppressed because one or more lines are too long