0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

update according to OxUI API changes

Browse source
This commit is contained in:
rolux 2011-04-27 21:50:43 +00:00
parent 8de94a0840
commit 087c21cbe4
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
static/js/pandora.js
View file

@ -178,9 +178,9 @@ Ox.load('UI', {
}), }),
[button('cancel'), button('submit')] [button('cancel'), button('submit')]
], ],
content: new Ox.Element('div') content: new Ox.Element()
.append( .append(
new Ox.Element('div') new Ox.Element()
.addClass('OxText') .addClass('OxText')
.html(dialogText[action] + '<br/><br/>') .html(dialogText[action] + '<br/><br/>')
) )
@ -414,7 +414,7 @@ Ox.load('UI', {
}); });
}) })
], ],
content: new Ox.Element('div').html('Are you sure you want to logout?'), content: new Ox.Element().html('Are you sure you want to logout?'),
height: 160, height: 160,
keys: {enter: 'logout', escape: 'cancel'}, keys: {enter: 'logout', escape: 'cancel'},
title: 'Logout', title: 'Logout',
@ -442,7 +442,7 @@ Ox.load('UI', {
}) })
] ]
], ],
content: new Ox.Element('div').html('Welcome, ' + app.user.username + '!<br/><br/>Your account has been created.'), content: new Ox.Element().html('Welcome, ' + app.user.username + '!<br/><br/>Your account has been created.'),
height: 160, height: 160,
keys: {enter: 'close', escape: 'close'}, keys: {enter: 'close', escape: 'close'},
title: 'Welcome to ' + app.config.site.name, title: 'Welcome to ' + app.config.site.name,
@ -1393,7 +1393,7 @@ Ox.load('UI', {
//resizeFolders(); //resizeFolders();
} else if (app.user.ui.section == 'items') { } else if (app.user.ui.section == 'items') {
$.each(app.ui.sectionFolders.items, function(i, folder) { $.each(app.ui.sectionFolders.items, function(i, folder) {
var extras; var extras = [];
if (folder.id == 'personal' && app.user.level != 'guest') { if (folder.id == 'personal' && app.user.level != 'guest') {
extras = [new Ox.Select({ extras = [new Ox.Select({
items: [ items: [
@ -1716,7 +1716,7 @@ Ox.load('UI', {
info: function() { info: function() {
var that = new Ox.Element() var that = new Ox.Element()
.append( .append(
app.$ui.infoStill = new Ox.Element('div') app.$ui.infoStill = new Ox.Element()
.css({ .css({
position: 'absolute', position: 'absolute',
left: 0, left: 0,
@ -1725,7 +1725,7 @@ Ox.load('UI', {
}) })
) )
.append( .append(
app.$ui.infoTimeline = new Ox.Element('img') app.$ui.infoTimeline = new Ox.Element('<img>')
.css({ .css({
position: 'absolute', position: 'absolute',
left: 0, left: 0,
@ -1764,11 +1764,11 @@ Ox.load('UI', {
item: function() { item: function() {
var that; var that;
if (app.user.ui.itemView == 'info' || app.user.ui.itemView == 'files') { if (app.user.ui.itemView == 'info' || app.user.ui.itemView == 'files') {
that = new Ox.Element('div'); that = new Ox.Element();
} else if (app.user.ui.itemView == 'player') { } else if (app.user.ui.itemView == 'player') {
that = new Ox.Element('div'); that = new Ox.Element();
} else if (app.user.ui.itemView == 'timeline') { } else if (app.user.ui.itemView == 'timeline') {
that = new Ox.Element('div'); that = new Ox.Element();
} }
pandora.api.getItem(app.user.ui.item, function(result) { pandora.api.getItem(app.user.ui.item, function(result) {
if (app.user.ui.itemView == 'info') { if (app.user.ui.itemView == 'info') {
@ -1819,7 +1819,7 @@ Ox.load('UI', {
$.get('/static/html/itemInfo.html', {}, function(template) { $.get('/static/html/itemInfo.html', {}, function(template) {
//Ox.print(template); //Ox.print(template);
app.$ui.contentPanel.replaceElement(1, app.$ui.contentPanel.replaceElement(1,
app.$ui.item = new Ox.Element('div') app.$ui.item = new Ox.Element()
.append($.tmpl(template, result.data.item)) .append($.tmpl(template, result.data.item))
); );
}); });
@ -2199,7 +2199,7 @@ Ox.load('UI', {
app.$ui.map.resize(); app.$ui.map.resize();
}); });
} else { } else {
$list = new Ox.Element('<div>') $list = new Ox.Element()
.css({ .css({
width: '100px', width: '100px',
height: '100px', height: '100px',
@ -2727,7 +2727,7 @@ Ox.load('UI', {
size: 44 size: 44
}, },
{ {
element: new Ox.Element('div') element: new Ox.Element()
}, },
{ {
element: new Ox.Toolbar({ element: new Ox.Toolbar({
@ -3242,13 +3242,13 @@ Ox.load('UI', {
fontSize: '9px' fontSize: '9px'
}) })
.append( .append(
app.$ui.total = new Ox.Element('span') app.$ui.total = new Ox.Element('<span>')
) )
.append( .append(
new Ox.Element('span').html(' &mdash; ') new Ox.Element('<span>').html(' &mdash; ')
) )
.append( .append(
app.$ui.selected = new Ox.Element('span') app.$ui.selected = new Ox.Element('<span>')
) )
); );
return that; return that;