merge app into pandora
This commit is contained in:
parent
7081cd7544
commit
40b2ca0dff
35 changed files with 735 additions and 734 deletions
|
|
@ -2,7 +2,7 @@
|
|||
pandora.ui.info = function() {
|
||||
var that = new Ox.Element()
|
||||
.append(
|
||||
app.$ui.infoStill = new Ox.Element()
|
||||
pandora.$ui.infoStill = new Ox.Element()
|
||||
.css({
|
||||
position: 'absolute',
|
||||
left: 0,
|
||||
|
|
@ -11,7 +11,7 @@ pandora.ui.info = function() {
|
|||
})
|
||||
)
|
||||
.append(
|
||||
app.$ui.infoTimeline = new Ox.Element('<img>')
|
||||
pandora.$ui.infoTimeline = new Ox.Element('<img>')
|
||||
.css({
|
||||
position: 'absolute',
|
||||
left: 0,
|
||||
|
|
@ -25,25 +25,25 @@ pandora.ui.info = function() {
|
|||
pandora.resizeFolders();
|
||||
}
|
||||
});
|
||||
if(app.user.ui.item) {
|
||||
pandora.api.getItem(app.user.ui.item, function(result) {
|
||||
app.ui.infoRatio = result.data.stream.aspectRatio;
|
||||
if(pandora.user.ui.item) {
|
||||
pandora.api.getItem(pandora.user.ui.item, function(result) {
|
||||
pandora.user.infoRatio = result.data.stream.aspectRatio;
|
||||
var width = that.width() || 256,
|
||||
height = width / app.ui.infoRatio + 16;
|
||||
app.$ui.infoStill.removeElement();
|
||||
app.$ui.infoStill = pandora.ui.flipbook(app.user.ui.item)
|
||||
height = width / pandora.user.infoRatio + 16;
|
||||
pandora.$ui.infoStill.removeElement();
|
||||
pandora.$ui.infoStill = pandora.ui.flipbook(pandora.user.ui.item)
|
||||
.appendTo(that.$element);
|
||||
app.$ui.infoStill.css({
|
||||
pandora.$ui.infoStill.css({
|
||||
'height': (height-16) + 'px'
|
||||
});
|
||||
that.css({
|
||||
height: height + 'px'
|
||||
});
|
||||
pandora.resizeFolders();
|
||||
!app.user.ui.showInfo && app.$ui.leftPanel.css({bottom: -height});
|
||||
app.$ui.leftPanel.size(2, height );
|
||||
!pandora.user.ui.showInfo && pandora.$ui.leftPanel.css({bottom: -height});
|
||||
pandora.$ui.leftPanel.size(2, height );
|
||||
});
|
||||
app.$ui.infoTimeline.attr('src', '/'+app.user.ui.item+'/timeline.16.png');
|
||||
pandora.$ui.infoTimeline.attr('src', '/'+pandora.user.ui.item+'/timeline.16.png');
|
||||
}
|
||||
return that;
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue