diff --git a/static/js/pandora/ui/folderBrowserBar.js b/static/js/pandora/ui/folderBrowserBar.js index bc6df0ef..9450e668 100644 --- a/static/js/pandora/ui/folderBrowserBar.js +++ b/static/js/pandora/ui/folderBrowserBar.js @@ -3,7 +3,6 @@ pandora.ui.folderBrowserBar = function(id) { var that = Ox.Bar({ size: 24 }); - Ox.print('ID', id) pandora.$ui.findListElement[id] = Ox.FormElementGroup({ elements: [ pandora.$ui.findListSelect[id] = Ox.Select({ @@ -22,12 +21,14 @@ pandora.ui.folderBrowserBar = function(id) { } }), pandora.$ui.findListInput[id] = Ox.Input({ + changeOnKeypress: true, clear: true, placeholder: 'Find: User', width: pandora.getFoldersWidth() - 24 }) .bindEvent({ - submit: function(data) { + change: function(data) { + Ox.print('ID::', id) var key = pandora.$ui.findListSelect[id].value() == 'user' ? 'user' : 'name', value = data.value; pandora.$ui.folderList[id].options({ @@ -55,6 +56,7 @@ pandora.ui.folderBrowserBar = function(id) { align: 'right' }) .appendTo(that); + return that; }; diff --git a/static/js/pandora/ui/folderBrowserList.js b/static/js/pandora/ui/folderBrowserList.js index 53fd8b12..19e2e773 100644 --- a/static/js/pandora/ui/folderBrowserList.js +++ b/static/js/pandora/ui/folderBrowserList.js @@ -55,7 +55,7 @@ pandora.ui.folderBrowserList = function(id) { }, { clickable: function(data) { - return data.type == 'smart'; + return data.type == 'smart' || data.user == pandora.user.username; }, format: function(value, data) { return $('') @@ -83,7 +83,7 @@ pandora.ui.folderBrowserList = function(id) { tooltip: function(data) { return data.type == 'smart' ? (data.user == pandora.user.username ? 'Edit Query' : 'Show Query') - : ''; + : (data.user == pandora.user.username ? 'Edit Default View' : 'Default View: ...'); }, visible: true, width: 16 diff --git a/static/js/pandora/ui/foldersList.js b/static/js/pandora/ui/foldersList.js index c490a66a..543887c2 100644 --- a/static/js/pandora/ui/foldersList.js +++ b/static/js/pandora/ui/foldersList.js @@ -42,7 +42,7 @@ pandora.ui.folderList = function(id) { autovalidate: pandora.ui.autovalidateListname }, operator: '+', - tooltip: id == 'personal' ? 'Edit Title' : null, + tooltip: id == 'personal' ? 'Edit Title' : '', visible: id != 'favorite', width: pandora.user.ui.sidebarWidth - 96 }, @@ -56,7 +56,7 @@ pandora.ui.folderList = function(id) { }, { clickable: function(data) { - return data.type == 'smart'; + return data.type == 'smart' || data.user == pandora.user.username; }, format: function(value, data) { return $('') @@ -75,7 +75,7 @@ pandora.ui.folderList = function(id) { tooltip: function(data) { return data.type == 'smart' ? (data.user == pandora.user.username ? 'Edit Query' : 'Show Query') - : ''; + : (data.user == pandora.user.username ? 'Edit Default View' : 'Default View: ...'); }, visible: true, width: 16