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

fix for a bug where, when collapsing the sidebar and then swapping groups, their column widths would be wrong

Browse source
This commit is contained in:
rlx 2011-01-04 00:18:36 +00:00
parent 4b591eeaac
commit 4d7374a59a
1 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
static/js/pandora.js
View file

@ -779,7 +779,7 @@ var pandora = new Ox.App({
*/ */
//alert(id + ' ' + JSON.stringify(Query.toObject(id))) //alert(id + ' ' + JSON.stringify(Query.toObject(id)))
var i = app.user.ui.groups.indexOf(id), var i = app.user.ui.groups.indexOf(id),
panelWidth = app.$ui.document.width() - app.user.ui.listsSize - 1, panelWidth = app.$ui.document.width() - (app.user.ui.showSidebar * app.user.ui.sidebarSize) - 1,
title = Ox.getObjectById(app.config.groups, id).title, title = Ox.getObjectById(app.config.groups, id).title,
width = getGroupWidth(i, panelWidth), width = getGroupWidth(i, panelWidth),
that = new Ox.TextList({ that = new Ox.TextList({
@ -1074,24 +1074,30 @@ var pandora = new Ox.App({
element: app.$ui.info = ui.info().options({ element: app.$ui.info = ui.info().options({
id: 'infoPanel' id: 'infoPanel'
}), }),
size: app.user.ui.listsSize / app.ui.infoRatio + 16 size: app.user.ui.sidebarSize / app.ui.infoRatio + 16
} }
], ],
id: 'leftPanel', id: 'leftPanel',
orientation: 'vertical' orientation: 'vertical'
}) })
.bindEvent('resize', function(event, data) { .bindEvent({
if (data < app.ui.sectionButtonsWidth && app.$ui.sectionButtons) { resize: function(event, data) {
app.$ui.sectionButtons.remove(); app.user.ui.sidebarSize = data;
delete app.$ui.sectionButtons; if (data < app.ui.sectionButtonsWidth && app.$ui.sectionButtons) {
app.$ui.sectionbar.append(app.$ui.sectionSelect = ui.sectionSelect()); app.$ui.sectionButtons.remove();
} else if (data >= app.ui.sectionButtonsWidth && app.$ui.sectionSelect) { delete app.$ui.sectionButtons;
app.$ui.sectionSelect.remove(); app.$ui.sectionbar.append(app.$ui.sectionSelect = ui.sectionSelect());
delete app.$ui.sectionSelect; } else if (data >= app.ui.sectionButtonsWidth && app.$ui.sectionSelect) {
app.$ui.sectionbar.append(app.$ui.sectionButtons = ui.sectionButtons()); app.$ui.sectionSelect.remove();
delete app.$ui.sectionSelect;
app.$ui.sectionbar.append(app.$ui.sectionButtons = ui.sectionButtons());
}
Ox.print('resize', data, data / app.ui.infoRatio + 16);
app.$ui.leftPanel.size('infoPanel', Math.round(data / app.ui.infoRatio) + 16);
},
toggle: function(event, data) {
app.user.ui.showSidebar = !data.collapsed;
} }
Ox.print('resize', data, data / app.ui.infoRatio + 16);
app.$ui.leftPanel.size('infoPanel', Math.round(data / app.ui.infoRatio) + 16);
}); });
return that; return that;
}, },
@ -2006,7 +2012,7 @@ var pandora = new Ox.App({
element: app.$ui.leftPanel = ui.leftPanel(), element: app.$ui.leftPanel = ui.leftPanel(),
resizable: true, resizable: true,
resize: [128, 256, 384, 512], resize: [128, 256, 384, 512],
size: app.user.ui.listsSize size: app.user.ui.sidebarSize
}, },
{ {
element: app.$ui.rightPanel = ui.rightPanel() element: app.$ui.rightPanel = ui.rightPanel()