0x2620/cablegates
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

merging changes

Browse source
This commit is contained in:
rlx 2011-08-21 08:17:10 +00:00
parent 402111f99c
commit 34ec9d8fc5
3 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pandora/0xdb.json
View file

@ -1,4 +1,13 @@
{ {
"clipKeys": [
{"id": "value", "title": "Text"},
{"id": "in", "title": "Position"},
{"id": "duration": "title": "Duration"},
{"id": "hue", "title": "Hue"},
{"id": "saturation", "title": "Saturation"},
{"id": "lightness": "title": "Lightness"},
{"id": "volume": "title": "Volume"}
],
"groups": [ "groups": [
{"id": "director", "title": "Director"}, {"id": "director", "title": "Director"},
{"id": "country", "title": "Country"}, {"id": "country", "title": "Country"},

3
static/js/pandora/ui/infoView.js
View file

@ -439,8 +439,9 @@ pandora.ui.infoView = function(data) {
}, pandora.user.ui.icons == 'posters' ? { }, pandora.user.ui.icons == 'posters' ? {
source: selectedImage.source source: selectedImage.source
} : { } : {
position: selectedImage.index // fixme: api slightly inconsistent position: selectedImage.index // fixme: api slightly inconsistent, this shouldn't be "position"
}), function() { }), function() {
// fixme: update the info (video preview) frame as well
var src; var src;
if (pandora.user.ui.icons == 'frames') { if (pandora.user.ui.icons == 'frames') {
src = '/' + data.id + '/icon512.jpg?' + Ox.uid() src = '/' + data.id + '/icon512.jpg?' + Ox.uid()

4
static/js/pandora/ui/menu.js
View file

@ -76,7 +76,9 @@ pandora.ui.mainMenu = function() {
{ id: 'icons', title: 'Icons', items: [ { id: 'icons', title: 'Icons', items: [
{ group: 'viewicons', min: 1, max: 1, items: ['posters', 'frames'].map(function(icons) { { group: 'viewicons', min: 1, max: 1, items: ['posters', 'frames'].map(function(icons) {
return {id: icons, title: Ox.toTitleCase(icons), checked: pandora.user.ui.icons == icons}; return {id: icons, title: Ox.toTitleCase(icons), checked: pandora.user.ui.icons == icons};
}) } }) },
{},
{ id: 'usesiteposter', title: 'Always Use ' + pandora.site.site.name + ' Poster' }
] }, ] },
{}, {},
{ id: 'openmovie', title: ['Open ' + pandora.site.itemName.singular, 'Open ' + pandora.site.itemName.plural], items: [ { id: 'openmovie', title: ['Open ' + pandora.site.itemName.singular, 'Open ' + pandora.site.itemName.plural], items: [