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

fix previous fix

Browse source
This commit is contained in:
rolux 2012-02-19 08:09:41 +00:00
parent 5dfc1f48fc
commit 87063818f7
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pandora/padma.jsonc
View file

@ -435,7 +435,6 @@
"title": "Places", "title": "Places",
"canAddAnnotations": {"member": true, "staff": true, "admin": true}, "canAddAnnotations": {"member": true, "staff": true, "admin": true},
"item": "Place", "item": "Place",
"overlap": true,
"type": "place" "type": "place"
}, },
{ {
@ -443,7 +442,6 @@
"title": "Events", "title": "Events",
"canAddAnnotations": {"member": true, "staff": true, "admin": true}, "canAddAnnotations": {"member": true, "staff": true, "admin": true},
"item": "Event", "item": "Event",
"overlap": true,
"type": "event" "type": "event"
}, },
{ {
@ -451,7 +449,7 @@
"title": "Keywords", "title": "Keywords",
"canAddAnnotations": {"member": true, "staff": true, "admin": true}, "canAddAnnotations": {"member": true, "staff": true, "admin": true},
"item": "Keyword", "item": "Keyword",
"overlap": true, "isSubtitle": true,
"type": "string" "type": "string"
}, },
{ {

2
static/js/pandora/utils.js
View file

@ -793,7 +793,7 @@ pandora.getVideoOptions = function(data) {
var canPlayClips = data.editable || pandora.site.capabilities.canPlayClips[pandora.user.level] >= data.rightslevel, var canPlayClips = data.editable || pandora.site.capabilities.canPlayClips[pandora.user.level] >= data.rightslevel,
canPlayVideo = data.editable || pandora.site.capabilities.canPlayVideo[pandora.user.level] >= data.rightslevel, canPlayVideo = data.editable || pandora.site.capabilities.canPlayVideo[pandora.user.level] >= data.rightslevel,
options = {}, options = {},
subtitlesLayer = Ox.getObject(pandora.site.layers, 'isSubtitle', true); subtitlesLayer = Ox.getObject(pandora.site.layers, 'isSubtitle', true).id;
options.subtitles = subtitlesLayer ? data.layers[subtitlesLayer].items.map(function(subtitle) { options.subtitles = subtitlesLayer ? data.layers[subtitlesLayer].items.map(function(subtitle) {
return {'in': subtitle['in'], out: subtitle.out, text: subtitle.value}; return {'in': subtitle['in'], out: subtitle.out, text: subtitle.value};
}) : []; }) : [];