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

@ -3,25 +3,25 @@ pandora.ui.appPanel = function() {
var that = new Ox.SplitPanel({
elements: [
{
element: app.$ui.mainMenu = pandora.ui.mainMenu(),
element: pandora.$ui.mainMenu = pandora.ui.mainMenu(),
size: 20
},
{
element: app.$ui.mainPanel = pandora.ui.mainPanel()
element: pandora.$ui.mainPanel = pandora.ui.mainPanel()
}
],
orientation: 'vertical'
});
that.display = function() {
// fixme: move animation into Ox.App
app.$ui.body.css({opacity: 0});
that.appendTo(app.$ui.body);
app.$ui.body.animate({opacity: 1}, 1000);
pandora.$ui.body.css({opacity: 0});
that.appendTo(pandora.$ui.body);
pandora.$ui.body.animate({opacity: 1}, 1000);
return that;
}
that.reload = function() {
app.$ui.appPanel.removeElement();
app.$ui.appPanel = pandora.ui.appPanel().appendTo(app.$ui.body);
pandora.$ui.appPanel.removeElement();
pandora.$ui.appPanel = pandora.ui.appPanel().appendTo(pandora.$ui.body);
return that;
}
return that;