text key clip lists

static/js/pandora/clipList.js

@@ -7,7 +7,9 @@ pandora.ui.clipList = function(videoRatio) {
     var ui = pandora.user.ui,
         fixedRatio = !ui.item ? 16/9 : videoRatio,
         isClipView = !ui.item ? ui.listView == 'clip' : ui.itemView == 'clips',
-
+        textKey = Ox.getObjectById(pandora.site.layers, 'subtitles')
+            ? 'subtitles'
+            : 'annotations',
         that = Ox.IconList({
             fixedRatio: fixedRatio,
             item: function(data, sort, size) {
@@ -22,7 +24,7 @@ pandora.ui.clipList = function(videoRatio) {
                     width = fixedRatio > 1 ? size : Math.round(size * fixedRatio);
                     height = fixedRatio > 1 ? Math.round(size / fixedRatio) : size;
                 }
-                title = data.subtitles ? data.subtitles[0].value : ''; //fixme: could be other layer
+                title = data[textKey] ? data[textKey][0].value : '';
                 url = '/' + data.id.split('/')[0] + '/' + height + 'p' + data['in'] + '.jpg';
                 sortKey = sort[0].key;
                 if (['text', 'position', 'duration'].indexOf(sortKey) > -1) {
@@ -79,7 +81,7 @@ pandora.ui.clipList = function(videoRatio) {
                 }, data), callback);
             },
             keys: Ox.merge(
-                ['id', 'in', 'out', 'subtitles'], //fixme: could be other layer
+                ['id', 'in', 'out', textKey],
                 !ui.item ? ['videoRatio'] : []
             ),
             max: 1,

static/js/pandora/info.js

@@ -308,7 +308,7 @@ pandora.ui.posterInfo = function(data) {
             })
             .html(
                 data.title + (
-                    data.director ? ' (' + data.director.join(', ') + ')' : ''
+                    Ox.len(data.director) ? ' (' + data.director.join(', ') + ')' : ''
                 )
             ),
         that = Ox.SplitPanel({

static/js/pandora/item.js

@@ -32,7 +32,7 @@ pandora.ui.item = function() {
         pandora.$ui.itemTitle
             .options({
                 title: '<b>' + result.data.title
-                    + (result.data.director && result.data.director.length
+                    + (Ox.len(result.data.director)
                         ? ' (' + result.data.director.join(', ') + ')'
                         : '')
                     + (result.data.year ? ' ' + result.data.year : '') + '</b>'