merging changes

static/js/pandora/pandora.js

@@ -124,13 +124,14 @@ pandora.reloadList = function() {
     });
     app.$ui.list.bindEvent({
             init: function(event, data) {
-                app.$ui.folderList[listData.status]
-                    .value(listData.id, 'items', data.items);
+                var folder = listData.status == 'private' ? 'personal' : listData.status;
+                app.$ui.folderList[folder].value(listData.id, 'items', data.items);
             }
         })
         .bindEventOnce({
             load: function(event, data) {
-                app.$ui.list.gainFocus().options({selected: [data.items]});
+                app.$ui.list.gainFocus();
+                if (data) app.$ui.list.options({selected: [data.items]});
             }
         })
         .reloadList();

static/js/pandora/ui/info.js

@@ -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();
             }
         });

static/js/pandora/ui/list.js

@@ -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;