decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

fix bugs with selection of lists in featured lists browser

Browse source
This commit is contained in:
rolux 2011-11-07 18:17:46 +00:00
parent 2e8fb609bf
commit de0fae53c2
2 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
static/js/pandora/folderList.js
View file

@ -364,6 +364,11 @@ pandora.ui.folderList = function(id) {
},
select: function(data) {
var list = data.ids.length ? data.ids[0] : '';
if (list) {
Ox.forEach(pandora.$ui.folderList, function($list, id_) {
id != id_ && $list.options('selected', []);
});
}
pandora.UI.set({
find: {
conditions: list ? [

28
static/js/pandora/utils.js
View file

@ -573,20 +573,30 @@ pandora.getItemByIdOrTitle = function(str, callback) {
}
pandora.getListData = function(list) {
var data = {};
var data = {}, folder;
list = Ox.isUndefined(list) ? pandora.user.ui._list : list;
if (list) {
Ox.forEach(pandora.$ui.folderList, function($list, id) {
var values = $list.value(list);
if (!Ox.isEmpty(values)) {
data = Ox.extend({
editable: values.user == pandora.user.username
&& values.type == 'static',
folder: id
}, values);
return false;
var ret = true;
// for the current list, we have to check in which
// folder it is selected, since for example, a personal
// list may appear again in the featured lists browser
if (
list == pandora.user.ui._list
&& $list.options('selected').length
) {
folder = id;
ret = false;
} else if (!Ox.isEmpty($list.value(list))) {
folder = id
ret = false;
}
});
if (folder) {
data = pandora.$ui.folderList[folder].value(pandora.user.ui._list);
data.editable = data.user == pandora.user.username && data.type == 'static';
data.folder = folder;
}
}
return data;
};