scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-07 15:33:50 +08:00
Code Issues Projects Releases Packages Wiki Activity

fixes samples table dropdown edit mode [fixes SCI-785]

Browse source
This commit is contained in:
zmagod 2016-12-13 15:43:31 +01:00
parent e5a0ad9b23
commit fa19bf1de7
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/assets/javascripts/samples/sample_datatable.js
View file

@ -1067,7 +1067,10 @@ function changeToEditMode() {
controls.hide(); controls.hide();
textEdit.css('display', ''); // show() doesn't work textEdit.css('display', ''); // show() doesn't work
controlsEdit.css('display', ''); // show() doesn't work controlsEdit.css('display', ''); // show() doesn't work
dropdownList.sortable('disable');
dropdownList.on('click', function(ev) {
ev.stopPropagation();
});
// Focus input // Focus input
textEdit.focus(); textEdit.focus();
}); });
@ -1080,6 +1083,7 @@ function changeToEditMode() {
// On ok buttons click // On ok buttons click
dropdownList.on('click', '.ok', function(event) { dropdownList.on('click', '.ok', function(event) {
event.stopPropagation(); event.stopPropagation();
dropdownList.sortable('enable');
var self = $(this); var self = $(this);
var li = self.closest('li'); var li = self.closest('li');
editColumn(li); editColumn(li);
@ -1089,6 +1093,7 @@ function changeToEditMode() {
dropdownList.on('keydown', 'input.text-edit', function(event) { dropdownList.on('keydown', 'input.text-edit', function(event) {
if (event.keyCode === 13) { if (event.keyCode === 13) {
event.preventDefault(); event.preventDefault();
dropdownList.sortable('enable');
var self = $(this); var self = $(this);
var li = self.closest('li'); var li = self.closest('li');
editColumn(li); editColumn(li);
@ -1098,6 +1103,7 @@ function changeToEditMode() {
// On cancel buttons click // On cancel buttons click
dropdownList.on('click', '.cancel', function(event) { dropdownList.on('click', '.cancel', function(event) {
event.stopPropagation(); event.stopPropagation();
dropdownList.sortable('enable');
var self = $(this); var self = $(this);
var li = self.closest('li'); var li = self.closest('li');
@ -1206,6 +1212,7 @@ function changeToEditMode() {
}); });
$('#samples-columns-dropdown').on('show.bs.dropdown', function() { $('#samples-columns-dropdown').on('show.bs.dropdown', function() {
loadColumnsNames(); loadColumnsNames();
dropdownList.sortable('enable');
}); });
} }