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

Fix bug on edit/cancel sample group page

Browse source 
Closes SCI-814.
This commit is contained in:
Luka Murn 2016-12-23 12:50:49 +01:00
parent 3922be2b17
commit 87d8fece46
1 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/assets/javascripts/samples/sample_types_groups.js
View file

@ -39,10 +39,11 @@
url: href, url: href,
data: { id: id }, data: { id: id },
success: function(data) { success: function(data) {
$(li).replaceWith($.parseHTML(data.html)); var newLi = $.parseHTML(data.html);
$(li).replaceWith(newLi);
editSampleTypeForm(); editSampleTypeForm();
destroySampleTypeGroup(); destroySampleTypeGroup();
initSampleColorPicker(li) initSampleColorPicker(newLi);
appendCarretToColorPickerDropdown(); appendCarretToColorPickerDropdown();
editSampleGroupColor(); editSampleGroupColor();
editSampleGroupForm(); editSampleGroupForm();
@ -111,7 +112,6 @@
} }
function editSampleGroupColor() { function editSampleGroupColor() {
$(document).ready(function() {
$('.edit_sample_group a.color-btn').off(); $('.edit_sample_group a.color-btn').off();
$('.edit_sample_group a.color-btn').on('click', function() { $('.edit_sample_group a.color-btn').on('click', function() {
var color = $(this).attr('data-value'); var color = $(this).attr('data-value');
@ -120,7 +120,6 @@
.val(color); .val(color);
form.submit(); form.submit();
}); });
});
} }
function bindNewSampleGroupAction() { function bindNewSampleGroupAction() {
@ -187,12 +186,13 @@
$.ajax({ $.ajax({
url: li.attr('data-edit'), url: li.attr('data-edit'),
success: function(data) { success: function(data) {
$(li).replaceWith($.parseHTML(data.html)); var newLi = $.parseHTML(data.html);
$(li).replaceWith(newLi);
submitEditSampleTypeGroupForm(); submitEditSampleTypeGroupForm();
abortEditSampleTypeGroupAction(); abortEditSampleTypeGroupAction();
destroySampleTypeGroup(); destroySampleTypeGroup();
initSampleColorPicker(li); initSampleColorPicker(newLi);
appendCarretToColorPickerDropdown(); appendCarretToColorPickerDropdown();
editSampleGroupColor(); editSampleGroupColor();
@ -203,10 +203,11 @@
$('#edit_sample_group_' + data.id).off(); $('#edit_sample_group_' + data.id).off();
$('#edit_sample_group_' + data.id) $('#edit_sample_group_' + data.id)
.bind('ajax:success', function(ev, data) { .bind('ajax:success', function(ev, data) {
$(this).closest('li').replaceWith($.parseHTML(data.html)); var newLi = $.parseHTML(data.html);
$(this).closest('li').replaceWith(newLi);
editSampleGroupForm(); editSampleGroupForm();
destroySampleTypeGroup(); destroySampleTypeGroup();
initSampleColorPicker($(this).closest('li')); initSampleColorPicker(newLi);
appendCarretToColorPickerDropdown(); appendCarretToColorPickerDropdown();
editSampleGroupColor(); editSampleGroupColor();
}).bind('ajax:error', function(ev, error){ }).bind('ajax:error', function(ev, error){