diff -r 39b2dab4f939 -r 7b721b427b73 web/static/js/projectscontents.js --- a/web/static/js/projectscontents.js Tue Sep 21 04:27:08 2010 +0200 +++ b/web/static/js/projectscontents.js Tue Sep 21 06:34:28 2010 +0200 @@ -117,7 +117,11 @@ function searchCallback(target, container_selector, url, timeout) { timeout = typeof(timeout) != 'undefined' ? timeout : 0; - var target = $(target); + var target = $(target); + + if(target.realVal().length > 0) { + target.nextAll(".searchclear").show(); + } if(target.attr('timer')) { clearTimeout(target.attr('timer')); @@ -125,11 +129,13 @@ target.attr('timer',setTimeout(function() { target.next(".searchajaxloader").show(); - target.next(".searchclear").hide(); - url = url.replace('__FILTER__',escape($(target).realVal())); + target.nextAll(".searchclear").hide(); + url = url.replace('__FILTER__',escape(target.realVal())); $(container_selector).load(url, null, function() { target.next(".searchajaxloader").hide(); - target.next(".searchclear").show(); + if(target.realVal().length > 0) { + target.nextAll(".searchclear").show(); + } init_events($(container_selector)); target.removeAttr('timer'); }); @@ -174,8 +180,7 @@ $(e.target).blur(); $(e.target).next(".searchajaxloader").hide(); } - }); - + }); $('.searchfieldinput').each(function(i) { var sbox = $(this); @@ -206,5 +211,18 @@ searchCallback(e.target, value['container_selector'], value['url']); }); }); + + $('.searchclear').click(function(e) { + var box = $(e.target).parent().find("input"); + box.val(box.attr('defaultText')); + box.addClass("searchfieldinput"); + box.blur(); + box.keyup(); + $(e.target).hide(); + }); + + $('.searchclear').each(function(i) { + $(this).hide(); + }); }