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

Tables now have fixed 200 px height, which solves various issues and the scrollbar clipping to the bottom

Browse source
This commit is contained in:
Zanz2 2018-02-16 14:14:51 +01:00
parent 673901fb01
commit 5c93bd9676
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/views/protocols/import_export/_import_json_protocol_p_desc.html.erb
View file

@ -66,7 +66,7 @@
<% table_hash = JSON.parse((Base64.decode64(table['contents']))) %> <% table_hash = JSON.parse((Base64.decode64(table['contents']))) %>
<% pio_table_id = "pio_table_prot_info_"+table_count.to_s %> <% pio_table_id = "pio_table_prot_info_"+table_count.to_s %>
<% protocol_table_elements_array.push([pio_table_id,table_hash['data']]) %> <% protocol_table_elements_array.push([pio_table_id,table_hash['data']]) %>
<div id="<%=pio_table_id%>" ></div> <div id="<%=pio_table_id%>"></div><br>
<% table_count += 1 %> <% table_count += 1 %>
<% end %> <% end %>
</div> </div>
@ -88,7 +88,8 @@ $('#modal-import-json-protocol-preview').on('shown.bs.modal', function (e) {
colHeaders: true, colHeaders: true,
fillHandle: false, fillHandle: false,
formulas: true, formulas: true,
readOnly: true readOnly: true,
height: 200
}); });
} }
}) })

6
app/views/protocols/import_export/_import_json_protocol_s_desc.html.erb
View file

@ -128,7 +128,7 @@
<% table_hash = JSON.parse((Base64.decode64(table['contents']))) %> <% table_hash = JSON.parse((Base64.decode64(table['contents']))) %>
<% pio_table_id = "pio_table_step_"+counter.to_s+"_info_"+table_count.to_s %> <% pio_table_id = "pio_table_step_"+counter.to_s+"_info_"+table_count.to_s %>
<% step_table_elements_array.push([pio_table_id,table_hash['data']]) %> <% step_table_elements_array.push([pio_table_id,table_hash['data']]) %>
<div id="<%=pio_table_id%>" ></div> <div id="<%=pio_table_id%>"></div><br>
<% table_count += 1 %> <% table_count += 1 %>
<% end %> <% end %>
</div> </div>
@ -145,6 +145,7 @@
{ {
var target = document.getElementById(javascript_table_elements_s[j][0]); var target = document.getElementById(javascript_table_elements_s[j][0]);
var hot = new Handsontable(target, { var hot = new Handsontable(target, {
data: javascript_table_elements_s[j][1], data: javascript_table_elements_s[j][1],
startRows: <%= Constants::HANDSONTABLE_INIT_ROWS_CNT %>, startRows: <%= Constants::HANDSONTABLE_INIT_ROWS_CNT %>,
@ -153,7 +154,8 @@
colHeaders: true, colHeaders: true,
fillHandle: false, fillHandle: false,
formulas: true, formulas: true,
readOnly: true readOnly: true,
height: 200
}); });
} }
}) })