From 9aff249881d03b50587f270edef9d0bfcd8f6259 Mon Sep 17 00:00:00 2001 From: rolux Date: Fri, 11 Nov 2011 14:23:51 +0000 Subject: [PATCH] fix find in list icon selector --- static/js/pandora/listDialog.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/static/js/pandora/listDialog.js b/static/js/pandora/listDialog.js index 8436bcc4..14d39f7b 100644 --- a/static/js/pandora/listDialog.js +++ b/static/js/pandora/listDialog.js @@ -64,7 +64,7 @@ pandora.ui.listDialog = function(section) { } }), pandora.$ui.findIconItemInput = Ox.Input({ - //changeOnKeypress: true, + changeOnKeypress: true, clear: true, placeholder: 'Find: All', width: 128 + Ox.UI.SCROLLBAR_SIZE @@ -491,10 +491,10 @@ pandora.ui.listIconPanel = function(listData) { items: function(data, callback) { pandora.api.find(Ox.extend(data, { query: { - conditions: [ - {key: 'list', value: listData.id, operator: '=='}, - {key: key, value: value, operator: '='} - ], + conditions: Ox.merge( + [{key: 'list', value: listData.id, operator: '=='}], + value !== '' ? [{key: key, value: value, operator: '='}] : [] + ), operator: '&' } }), callback);