Playlist.js: fixed search

This commit is contained in:
Anders Betnér 2006-03-24 07:47:43 +00:00
parent 33802c5dff
commit 6e9d4ef491

View File

@ -10,12 +10,14 @@ function initPlaylist() {
Event.observe('genres','change',EventHandler.genresChange); Event.observe('genres','change',EventHandler.genresChange);
Event.observe('artists','change',EventHandler.artistsChange); Event.observe('artists','change',EventHandler.artistsChange);
Event.observe('albums','change',EventHandler.albumsChange); Event.observe('albums','change',EventHandler.albumsChange);
// Firefox remebers the search box value on page reload
$('search').value='';
} }
// TODO busy message // TODO busy message
// timeout on search box // timeout on search box
// move stuff to responsehandler // move stuff to responsehandler
// handle source change events // handle source change events
// FIX broken browse
var Search = { var Search = {
keyPress: function (e) { keyPress: function (e) {
if (e.keyCode == Event.KEY_RETURN) { if (e.keyCode == Event.KEY_RETURN) {
@ -96,13 +98,12 @@ var Query = {
} }
if (this.searchString) { if (this.searchString) {
var search = []; var search = [];
var string = this.searchString; var string = this.searchString.encode();
['daap.songgenre','daap.songartist','daap.songalbum','dmap.itemname'].each(function (item) { ['daap.songgenre','daap.songartist','daap.songalbum','dmap.itemname'].each(function (item) {
search.push("'" + item +':*' + string + "*'"); search.push("'" + item +':*' + string + "*'");
}); });
if (query.length > 0) { if (query.length > 0) {
// alert('&query=(' +search.join(',') +')+(' + query.join(',')+ ')'); return '&query=(' +search.join(',') + ')+('.encode() + query.join(',')+ ')';
return '&query=(' +search.join(',') +')+(' + query.join(',')+ ')';
} else { } else {
return '&query=' + search.join(','); return '&query=' + search.join(',');
} }