merge app into pandora

This commit is contained in:
j 2011-06-06 17:48:11 +02:00
commit 40b2ca0dff
35 changed files with 735 additions and 734 deletions

View file

@ -1,29 +1,29 @@
// vim: et:ts=4:sw=4:sts=4:ft=js
pandora.ui.rightPanel = function() {
var that;
if (app.user.ui.section == 'site') {
if (pandora.user.ui.section == 'site') {
that = new Ox.Element()
.html(app.user.ui.sitePage)
.html(pandora.user.ui.sitePage)
.bindEvent({
resize: function(event, data) {
}
});
pandora.api.getPage(app.user.ui.sitePage, function(result) {
pandora.api.getPage(pandora.user.ui.sitePage, function(result) {
that.html(result.data.body).css({'overflow-y':'auto'});
});
} else if (app.user.ui.section == 'items') {
} else if (pandora.user.ui.section == 'items') {
that = new Ox.SplitPanel({
elements: [
{
element: app.$ui.toolbar = pandora.ui.toolbar(),
element: pandora.$ui.toolbar = pandora.ui.toolbar(),
size: 24
},
{
element: app.$ui.contentPanel = pandora.ui.contentPanel()
element: pandora.$ui.contentPanel = pandora.ui.contentPanel()
},
{
element: app.$ui.statusbar = pandora.ui.statusbar(),
element: pandora.$ui.statusbar = pandora.ui.statusbar(),
size: 16
}
],
@ -33,18 +33,18 @@ pandora.ui.rightPanel = function() {
.bindEvent({
resize: function(event, data) {
//Ox.print('???? resize rightPanel', event, data)
if (!app.user.ui.item) {
if (!pandora.user.ui.item) {
pandora.resizeGroups(data);
app.$ui.list.size();
if (app.user.ui.lists[app.user.ui.list].listView == 'map') {
app.$ui.map.resizeMap();
pandora.$ui.list.size();
if (pandora.user.ui.lists[pandora.user.ui.list].listView == 'map') {
pandora.$ui.map.resizeMap();
}
} else {
app.$ui.browser.scrollToSelection();
app.user.ui.itemView == 'player' && app.$ui.player.options({
pandora.$ui.browser.scrollToSelection();
pandora.user.ui.itemView == 'player' && pandora.$ui.player.options({
width: data
});
app.user.ui.itemView == 'timeline' && app.$ui.editor.options({
pandora.user.ui.itemView == 'timeline' && pandora.$ui.editor.options({
width: data
});
}