From fa1c4af6fa256f8ce521378e8cb9e42340c23497 Mon Sep 17 00:00:00 2001 From: rolux Date: Sun, 19 Feb 2012 08:05:41 +0000 Subject: [PATCH] fix previous fix --- static/js/pandora/utils.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/static/js/pandora/utils.js b/static/js/pandora/utils.js index 4ce03bd7..02520328 100644 --- a/static/js/pandora/utils.js +++ b/static/js/pandora/utils.js @@ -792,10 +792,11 @@ pandora.getSortOperator = function(key) { 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 = (Ox.getObject(data.layers, 'isSubtitle', true) || []).map(function(subtitle) { + options = {}, + subtitlesLayer = Ox.getObject(pandora.site.layers, isSubtitle, true); + options.subtitles = subtitlesLayer ? data.layers[subtitlesLayer].items.map(function(subtitle) { return {'in': subtitle['in'], out: subtitle.out, text: subtitle.value}; - }); + }) : []; options.censored = canPlayVideo ? [] : canPlayClips ? ( options.subtitles.length