forked from 0x2620/pandora
merging changes
This commit is contained in:
parent
97749b22c0
commit
4d5b0ded27
3 changed files with 14 additions and 2 deletions
|
@ -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": [
|
||||
{"id": "director", "title": "Director"},
|
||||
{"id": "country", "title": "Country"},
|
||||
|
|
|
@ -439,8 +439,9 @@ pandora.ui.infoView = function(data) {
|
|||
}, pandora.user.ui.icons == 'posters' ? {
|
||||
source: selectedImage.source
|
||||
} : {
|
||||
position: selectedImage.index // fixme: api slightly inconsistent
|
||||
position: selectedImage.index // fixme: api slightly inconsistent, this shouldn't be "position"
|
||||
}), function() {
|
||||
// fixme: update the info (video preview) frame as well
|
||||
var src;
|
||||
if (pandora.user.ui.icons == 'frames') {
|
||||
src = '/' + data.id + '/icon512.jpg?' + Ox.uid()
|
||||
|
|
|
@ -76,7 +76,9 @@ pandora.ui.mainMenu = function() {
|
|||
{ id: 'icons', title: 'Icons', items: [
|
||||
{ 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};
|
||||
}) }
|
||||
}) },
|
||||
{},
|
||||
{ id: 'usesiteposter', title: 'Always Use ' + pandora.site.site.name + ' Poster' }
|
||||
] },
|
||||
{},
|
||||
{ id: 'openmovie', title: ['Open ' + pandora.site.itemName.singular, 'Open ' + pandora.site.itemName.plural], items: [
|
||||
|
|
Loading…
Reference in a new issue