0x2620/pandora
2
1
Fork 1
Code Issues 1.2k 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
commit e6c6a19255
3 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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,
canPlayVideo = data.editable || pandora.site.capabilities.canPlayVideo[pandora.user.level] >= data.rightslevel,
options = {};
options.subtitles = data.layers.subtitles
? data.layers.subtitles.map(function(subtitle) {
return {'in': subtitle['in'], out: subtitle.out, text: subtitle.value};
})
: [];
options.subtitles = Ox.getObject(data.layers, 'isSubtitle', true) || []).map(function(subtitle) {
return {'in': subtitle['in'], out: subtitle.out, text: subtitle.value};
});
options.censored = canPlayVideo ? []
: canPlayClips ? (
options.subtitles.length