Merge pull request #14740 from MrPetovan/bug/14702-filer-callback

Fix itemFiler() callback
This commit is contained in:
Michael Vogel 2025-01-28 21:09:05 +01:00 committed by GitHub
commit a730259d97
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 48 additions and 37 deletions

View file

@ -199,37 +199,42 @@ function enableOnUser(){
} }
function itemFiler(id) { function itemFiler(id) {
const bordercolor = $("input").css("border-color");
var bordercolor = $("input").css("border-color"); $.get('filer/', function (data) {
$.colorbox({html: data});
$.get('filer/', function(data){ $("#id_term").keypress(function () {
$.colorbox({html:data}); $(this).css("border-color", bordercolor);
$("#id_term").keypress(function(){
$(this).css("border-color",bordercolor);
}) })
$("#select_term").change(function(){ $("#select_term").change(function () {
$("#id_term").css("border-color",bordercolor); $("#id_term").css("border-color", bordercolor);
}) })
$("#filer_save").click(function(e){ $("#filer_save").click(function (e) {
e.preventDefault(); e.preventDefault();
reply = $("#id_term").val(); const reply = $("#id_term").val();
if(reply && reply.length) { if (reply && reply.length) {
commentBusy = true; commentBusy = true;
formModified = true;
$('body').css('cursor', 'wait'); $('body').css('cursor', 'wait');
$.get('filer/' + id + '?term=' + reply, NavUpdate); $.get('filer/' + id + '?term=' + reply)
// if(timer) clearTimeout(timer); .done(function () {
// timer = setTimeout(NavUpdate,3000); $.colorbox.close();
liking = 1; resetFormModifiedFlag();
force_update = true; })
$.colorbox.close(); .always(function () {
liking = 1;
force_update = true;
update_item = id;
NavUpdate();
});
} else { } else {
$("#id_term").css("border-color","#FF0000"); $("#id_term").css("border-color", "#FF0000");
} }
return false; return false;
}); });
}); });
} }
function jotClearLocation() { function jotClearLocation() {

View file

@ -296,33 +296,39 @@
} }
function itemFiler(id) { function itemFiler(id) {
var bordercolor = $("input").css("border-color"); const bordercolor = $("input").css("border-color");
$.get('filer/', function(data){ $.get('filer/', function (data) {
$.colorbox({html:data}); $.colorbox({html: data});
$("#id_term").keypress(function(){ $("#id_term").keypress(function () {
$(this).css("border-color",bordercolor); $(this).css("border-color", bordercolor);
}) })
$("#select_term").change(function(){ $("#select_term").change(function () {
$("#id_term").css("border-color",bordercolor); $("#id_term").css("border-color", bordercolor);
}) })
$("#filer_save").click(function(e){ $("#filer_save").click(function (e) {
e.preventDefault(); e.preventDefault();
reply = $("#id_term").val(); const reply = $("#id_term").val();
if(reply && reply.length) { if (reply && reply.length) {
commentBusy = true; commentBusy = true;
formModified = true;
$('body').css('cursor', 'wait'); $('body').css('cursor', 'wait');
$.get('filer/' + id + '?term=' + reply, NavUpdate); $.get('filer/' + id + '?term=' + reply)
// if(timer) clearTimeout(timer); .done(function () {
// timer = setTimeout(NavUpdate,3000); $.colorbox.close();
liking = 1; resetFormModifiedFlag();
force_update = true; })
$.colorbox.close(); .always(function () {
formModified = true; // Mark the form as modified liking = 1;
force_update = true;
update_item = id;
NavUpdate();
});
} else { } else {
$("#id_term").css("border-color","#FF0000"); $("#id_term").css("border-color", "#FF0000");
} }
return false; return false;
}); });
}); });