merging changes

This commit is contained in:
rolux 2011-06-04 04:38:15 +00:00
commit 0003bb3e8f
8 changed files with 63 additions and 2470 deletions

View file

@ -21,7 +21,7 @@ pandora.ui.info = function() {
)
.bindEvent({
toggle: function(event, data) {
UI.set({showInfo: !data.collapsed});
pandora.UI.set({showInfo: !data.collapsed});
pandora.resizeFolders();
}
});

View file

@ -193,10 +193,10 @@ pandora.ui.list = function(view) { // fixme: remove view argument
});
},
'delete': function(event, data) {
getListData().editable && pandora.api.removeListItems({
pandora.getListData().editable && pandora.api.removeListItems({
list: app.user.ui.list,
items: data.ids
}, reloadList);
}, pandora.reloadList);
},
init: function(event, data) {
app.$ui.total.html(pandora.ui.status('total', data));
@ -317,10 +317,10 @@ pandora.ui.list = function(view) { // fixme: remove view argument
});
},
paste: function(event, data) {
data.items && getListData().editable && pandora.api.addListItems({
data.items && pandora.getListData().editable && pandora.api.addListItems({
list: app.user.ui.list,
items: data.items
}, reloadList);
}, pandora.reloadList);
},
select: function(event, data) {
var $still, $timeline;