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

remove duplicated includes of css and js

Browse source
This commit is contained in:
Mojca Lorber 2017-01-03 17:33:01 +01:00
parent c476faca30
commit a0704cd873
3 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/protocols/index.js
View file

@ -205,6 +205,7 @@ function initProtocolPreviewModal() {
modalTitle.html(data.title);
modalBody.html(data.html);
modalFooter.html(data.footer);
initHandsOnTable(modalBody);
modal.modal("show");
initHandsOnTable(modalBody);
},
@ -379,6 +380,7 @@ function initModals() {
$("#protocol-preview-modal").on("hidden.bs.modal", function(e) {
$(this).find(".modal-title").html("");
$(this).find(".modal-body").html("");
$(this).find(".modal-footer").html("");
});
}

1
app/assets/javascripts/protocols/steps.js.erb
View file

@ -284,7 +284,6 @@ function toggleButtons(show) {
// Creates handsontable where needed
function initHandsOnTable(root) {
root.find("[data-role='hot-table']").each(function() {
var $container = $(this).find("[data-role='step-hot-table']");
var contents = $(this).find('.hot-contents');

15
app/views/protocols/index/_protocol_preview_modal_body.html.erb
View file

@ -162,18 +162,3 @@
</div>
<% end %>
</div>
<%= javascript_include_tag "protocols/steps" %>
<!-- Libraries for formulas -->
<%= javascript_include_tag "lodash" %>
<%= javascript_include_tag "numeral" %>
<%= javascript_include_tag "numeric" %>
<%= javascript_include_tag "md5" %>
<%= javascript_include_tag "jstat" %>
<%= javascript_include_tag "formula" %>
<%= javascript_include_tag "parser" %>
<%= javascript_include_tag "ruleJS" %>
<%= javascript_include_tag "handsontable.formula" %>
<%= javascript_include_tag "big.min" %>
<%= stylesheet_link_tag "handsontable.formula" %>