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

misc changes

Browse source
This commit is contained in:
rolux 2011-01-03 12:01:14 +00:00
parent a14999110c
commit f34dfb7e95
2 changed files with 66 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
static/html/itemInfo.html
View file

@ -1,8 +1,8 @@
<div id="itemInfo"> <div id="itemInfo">
<div style="align: center; width: 128px; margin: 8px; float: left"> <div style="align: center; width: 256px; margin: 8px; float: left">
<img class="icon" src="/${id}/poster.128.jpg"> <img class="icon" style="height: 256px" src="/${id}/poster.jpg">
</div> </div>
<div style="width: 544px; float: left"> <div style="width: 512px; float: left">
<div id="movieTitle" class="movieData textLarge textLeft" style="margin-top: 0px; margin-bottom: 2px"> <div id="movieTitle" class="movieData textLarge textLeft" style="margin-top: 0px; margin-bottom: 2px">
${title} ${title}
</div> </div>

126
static/js/pandora.js
View file

@ -219,7 +219,7 @@ var pandora = new Ox.App({
items: $items, items: $items,
submit: function(data, callback) { submit: function(data, callback) {
if (action == 'login') { if (action == 'login') {
pandora.api.login(data, function(result) { pandora.api.signin(data, function(result) {
if (!result.data.errors) { if (!result.data.errors) {
app.$ui.accountDialog.close(); app.$ui.accountDialog.close();
login(result.data); login(result.data);
@ -228,7 +228,7 @@ var pandora = new Ox.App({
} }
}); });
} else if (action == 'register') { } else if (action == 'register') {
pandora.api.register(data, function(result) { pandora.api.signup(data, function(result) {
if (!result.data.errors) { if (!result.data.errors) {
app.$ui.accountDialog.close(); app.$ui.accountDialog.close();
login(result.data); login(result.data);
@ -407,7 +407,7 @@ var pandora = new Ox.App({
title: 'Logout' title: 'Logout'
}).bindEvent('click', function() { }).bindEvent('click', function() {
that.close(); that.close();
pandora.api.logout({}, function(result) { pandora.api.signout({}, function(result) {
logout(result.data); logout(result.data);
}); });
}) })
@ -747,7 +747,8 @@ var pandora = new Ox.App({
} }
return that; return that;
}, },
group: function(id) { group: function(id, query) {
Ox.print('group', id, query)
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.listsSize - 1,
title = Ox.getObjectById(app.config.groups, id).title, title = Ox.getObjectById(app.config.groups, id).title,
@ -781,6 +782,9 @@ var pandora = new Ox.App({
query: Query.toObject(id) query: Query.toObject(id)
}), callback); }), callback);
}, },
selected: query ? $.map(query.conditions, function(v) {
return v.key;
}) : [],
sort: [ sort: [
{ {
key: id == 'year' ? 'name' : 'items', key: id == 'year' ? 'name' : 'items',
@ -798,7 +802,70 @@ var pandora = new Ox.App({
operator: '=' operator: '='
}; };
}); });
query = Query.toObject(); reloadGroups();
});
new Ox.Select({
items: $.map(app.config.groups, function(v) {
return {
checked: v.id == id,
id: v.id,
title: v.title
}
}),
max: 1,
min: 1,
type: 'image'
})
.bindEvent('change', function(event, data) {
var id_ = data.selected[0].id,
i_ = app.user.ui.groups.indexOf(id_);
i_ == -1 ? replaceGroup(i, id_) : swapGroups();
function replaceGroup(i, id, query) {
var isOuter = i % 4 == 0;
if (i_ == -1) {
if (app.ui.groups[i].query.conditions.length) {
app.ui.groups[i].query.conditions = [];
reloadGroups();
}
app.ui.groups[i] = getGroupObject(id);
}
app.user.ui.groups[i] = id;
app.$ui[isOuter ? 'browser' : 'groupsInnerPanel'].replace(
isOuter ? i / 2 : i - 1,
app.$ui.groups[i] = ui.group(id, query)
);
}
function swapGroups() {
var group = $.extend({}, app.ui.groups[i]),
query = app.ui.groups[i].query;
query_ = app.ui.groups[i_].query;
app.ui.groups[i] = app.ui.groups[i_];
app.ui.groups[i_] = group;
app.user.ui.groups[i] = id_;
app.user.ui.groups[i_] = id;
replaceGroup(i, id_, query_);
replaceGroup(i_, id, query);
}
})
.appendTo(that.$bar.$element);
app.ui.groups[i] = getGroupObject(id);
function getGroupObject(id) {
var i = app.user.ui.groups.indexOf(id),
title = Ox.getObjectById(app.config.groups, id).title,
width = getGroupWidth(i, panelWidth);
return {
id: id,
element: that,
query: {
conditions: [],
operator: '|'
},
size: width.list,
title: title
};
}
function reloadGroups() {
var query = Query.toObject();
app.$ui.list.options({ app.$ui.list.options({
request: function(data, callback) { request: function(data, callback) {
return pandora.api.find($.extend(data, { return pandora.api.find($.extend(data, {
@ -821,50 +888,6 @@ var pandora = new Ox.App({
} }
}); });
history.pushState({}, '', Query.toString(query)); history.pushState({}, '', Query.toString(query));
});
new Ox.Select({
items: $.map(app.config.groups, function(v) {
return {
checked: v.id == id,
id: v.id,
title: v.title
}
}),
max: 1,
min: 1,
type: 'image'
})
.bindEvent('change', function(event, data) {
var id_ = data.selected[0].id,
index = app.user.ui.groups.indexOf(id_);
replaceGroup(i, id_);
index > -1 && replaceGroup(index, id);
function replaceGroup(i, id) {
app.user.ui.groups[i] = id;
if (i == 0 || i == 4) {
app.$ui.browser.replace(i / 2, app.$ui.groups[i] = ui.group(id));
} else {
app.$ui.groupsInnerPanel.replace(i - 1, app.$ui.groups[i] = ui.group(id));
}
app.ui.groups[i] = getGroupObject(id);
}
})
.appendTo(that.$bar.$element);
app.ui.groups[i] = getGroupObject(id);
function getGroupObject(id) {
var i = app.user.ui.groups.indexOf(id),
title = Ox.getObjectById(app.config.groups, id).title,
width = getGroupWidth(i, panelWidth);
return {
id: id,
element: that,
query: {
conditions: [],
operator: '|'
},
size: width.list,
title: title
};
} }
return that; return that;
}, },
@ -872,7 +895,7 @@ var pandora = new Ox.App({
var $groups = []; var $groups = [];
app.ui.groups = []; app.ui.groups = [];
app.user.ui.groups.forEach(function(id, i) { app.user.ui.groups.forEach(function(id, i) {
$groups[i] = ui.group(id, i) $groups[i] = ui.group(id);
}); });
return $groups; return $groups;
}, },
@ -1449,7 +1472,7 @@ var pandora = new Ox.App({
} }
}); });
that.display = function() { that.display = function() {
app.$ui.rightPanel.replace(1, app.$ui.contentPanel = ui.contentPanel());
}; };
return that; return that;
}, },
@ -2527,7 +2550,6 @@ var pandora = new Ox.App({
} }
} else { } else {
if (!app.user.ui.item) { if (!app.user.ui.item) {
alert('return')
ui.list(app.user.ui.listView).display(); ui.list(app.user.ui.listView).display();
} else { } else {
app.$ui.contentPanel.replace(1, ui.item()); app.$ui.contentPanel.replace(1, ui.item());