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

use 'isSubtitle' layer property

Browse source
This commit is contained in:
rolux 2012-02-19 07:52:08 +00:00
parent b1e8267a87
commit e6c6a19255
3 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pandora/0xdb.jsonc
View file

@ -545,8 +545,8 @@
"canAddAnnotations": {"staff": true, "admin": true}, "canAddAnnotations": {"staff": true, "admin": true},
"hasEvents": true, "hasEvents": true,
"hasPlaces": true, "hasPlaces": true,
"isSubtitles": true,
"item": "Subtitle", "item": "Subtitle",
"overlay": true,
"type": "text" "type": "text"
} }
], ],
@ -623,7 +623,7 @@
"newsletter": true, "newsletter": true,
"ui": { "ui": {
"annotationsFont": "small", "annotationsFont": "small",
"annotationsRange": "position", "annotationsRange": "all",
"annotationsSize": 256, "annotationsSize": 256,
"annotationsSort": "position", "annotationsSort": "position",
"clipsColumns": 2, "clipsColumns": 2,

2
pandora/padma.jsonc
View file

@ -459,7 +459,6 @@
"title": "Descriptions", "title": "Descriptions",
"canAddAnnotations": {"member": true, "staff": true, "admin": true}, "canAddAnnotations": {"member": true, "staff": true, "admin": true},
"item": "Description", "item": "Description",
"overlay": true,
"showInfo": true, "showInfo": true,
"type": "text" "type": "text"
}, },
@ -468,7 +467,6 @@
"title": "Transcripts", "title": "Transcripts",
"canAddAnnotations": {"member": true, "staff": true, "admin": true}, "canAddAnnotations": {"member": true, "staff": true, "admin": true},
"item": "Transcript", "item": "Transcript",
"overlay": true,
"showInfo": true, "showInfo": true,
"type": "text" "type": "text"
} }

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

@ -793,11 +793,9 @@ 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 = {};
options.subtitles = data.layers.subtitles options.subtitles = Ox.getObject(data.layers, 'isSubtitle', true) || []).map(function(subtitle) {
? data.layers.subtitles.map(function(subtitle) { return {'in': subtitle['in'], out: subtitle.out, text: subtitle.value};
return {'in': subtitle['in'], out: subtitle.out, text: subtitle.value}; });
})
: [];
options.censored = canPlayVideo ? [] options.censored = canPlayVideo ? []
: canPlayClips ? ( : canPlayClips ? (
options.subtitles.length options.subtitles.length