0x2620/cablegates
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

some more minor fixes

Browse source
This commit is contained in:
rlx 2011-01-14 11:20:11 +00:00
parent 22367c6653
commit 70bd9e7170
1 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
static/js/pandora.js
View file

@ -1670,7 +1670,8 @@ var pandora = new Ox.App({
query: query query: query
}), callback); }), callback);
}, },
selected: app.user.ui.list ? [app.user.ui.list] : [], // fixme: select if previously selected
// selected: app.user.ui.list ? [app.user.ui.list] : [],
sort: [ sort: [
{key: 'name', operator: '+'} {key: 'name', operator: '+'}
] ]
@ -1689,10 +1690,12 @@ var pandora = new Ox.App({
id: data.id, id: data.id,
status: that.value(data.id, 'status') == 'featured' ? 'public' : 'featured' status: that.value(data.id, 'status') == 'featured' ? 'public' : 'featured'
}, function(result) { }, function(result) {
if (result.data.user == app.user.username || result.data.subscribed) {
Ox.Request.emptyCache(); // fixme: remove Ox.Request.emptyCache(); // fixme: remove
app.$ui.sectionList[ app.$ui.sectionList[
result.data.user == app.user.username ? 0 : 1 result.data.user == app.user.username ? 0 : 1
].reloadList(); ].reloadList();
}
that.value(data.id, 'status', result.data.status); that.value(data.id, 'status', result.data.status);
}); });
} }
@ -1709,9 +1712,10 @@ var pandora = new Ox.App({
}, },
select: function(event, data) { select: function(event, data) {
// fixme: duplicated // fixme: duplicated
Ox.print("HELLO")
if (data.ids.length) { if (data.ids.length) {
app.$ui.sectionList.forEach(function($list, i_) { app.$ui.sectionList.forEach(function($list, i_) {
i != i && $list.options('selected', []); i != i_ && $list.options('selected', []);
}); });
URL.set('?find=list:' + data.ids[0]); URL.set('?find=list:' + data.ids[0]);
} else { } else {
@ -2515,10 +2519,13 @@ var pandora = new Ox.App({
id: data.ids[0], id: data.ids[0],
status: 'public' status: 'public'
}, function(result) { }, function(result) {
// fixme: duplicated
if (result.data.user == app.user.username || result.data.subscribed) {
Ox.Request.emptyCache(); // fixme: remove Ox.Request.emptyCache(); // fixme: remove
app.$ui.sectionList[ app.$ui.sectionList[
result.data.user == app.user.username ? 0 : 1 result.data.user == app.user.username ? 0 : 1
].reloadList(); ].reloadList();
}
$list.reloadList(); $list.reloadList();
}); });
} }
@ -2634,6 +2641,7 @@ var pandora = new Ox.App({
}) })
.bindEvent({ .bindEvent({
change: function(event, data) { change: function(event, data) {
Ox.Request.emptyCache(); // fixme: remove
app.ui.showPublicListsBrowser = !app.ui.showPublicListsBrowser; app.ui.showPublicListsBrowser = !app.ui.showPublicListsBrowser;
if (app.ui.showPublicListsBrowser) { if (app.ui.showPublicListsBrowser) {
app.$ui.sectionList[1].replaceWith(app.$ui.publicListsBrowser = ui.listsBrowser('public')); app.$ui.sectionList[1].replaceWith(app.$ui.publicListsBrowser = ui.listsBrowser('public'));
@ -2652,6 +2660,7 @@ var pandora = new Ox.App({
}) })
.bindEvent({ .bindEvent({
change: function(event, data) { change: function(event, data) {
Ox.Request.emptyCache(); // fixme: remove
app.ui.showFeaturedListsBrowser = !app.ui.showFeaturedListsBrowser; app.ui.showFeaturedListsBrowser = !app.ui.showFeaturedListsBrowser;
if (app.ui.showFeaturedListsBrowser) { if (app.ui.showFeaturedListsBrowser) {
app.$ui.sectionList[2].replaceWith(app.$ui.featuredListsBrowser = ui.listsBrowser('featured')); app.$ui.sectionList[2].replaceWith(app.$ui.featuredListsBrowser = ui.listsBrowser('featured'));
@ -2659,7 +2668,8 @@ var pandora = new Ox.App({
app.$ui.featuredListsBrowser.replaceWith(app.$ui.sectionList[2] = ui.sectionList('featured')); app.$ui.featuredListsBrowser.replaceWith(app.$ui.sectionList[2] = ui.sectionList('featured'));
} }
} }
})]; } })];
}
app.$ui.section[i] = new Ox.CollapsePanel({ app.$ui.section[i] = new Ox.CollapsePanel({
id: id, id: id,
extras: extras, extras: extras,
@ -2940,6 +2950,7 @@ var pandora = new Ox.App({
function getSectionsWidth() { function getSectionsWidth() {
var width = app.user.ui.sidebarSize; var width = app.user.ui.sidebarSize;
// fixme: don't use height(), look up in splitpanels // fixme: don't use height(), look up in splitpanels
Ox.print('>', app.$ui.leftPanel.height() - 24 - 1 - app.$ui.info.height())
if (getSectionsHeight() > app.$ui.leftPanel.height() - 24 - 1 - app.$ui.info.height()) { if (getSectionsHeight() > app.$ui.leftPanel.height() - 24 - 1 - app.$ui.info.height()) {
width -= app.ui.scrollbarSize; width -= app.ui.scrollbarSize;
} }