findClips

static/js/pandora/ui/clipList.js

@@ -24,12 +24,13 @@ pandora.ui.clipList = function(videoRatio) {
                 info = ['hue', 'saturation', 'lightness'].indexOf(sortKey) > -1
                     ? Ox.formatColor(data[sortKey], sortKey)
                     : Ox.formatDuration(data['in'], 'short') + ' - '
-                    + Ox.formatDuration(data['out'], 'short');
+                    + Ox.formatDuration(data['out'], 'short'),
+                title = data.subtitles[0]; //fixme: could be other layer
                 return {
                     height: height,
                     id: data.id,
                     info: info,
-                    title: data.value,
+                    title: title,
                     url: url,
                     width: width
                 };
@@ -65,13 +66,13 @@ pandora.ui.clipList = function(videoRatio) {
                     // we'll need something like itemFind (vs. listFind)
                     query = {conditions: [], operator: '&'};
                 }
-                pandora.api.findAnnotations(Ox.extend({
+                pandora.api.findClips(Ox.extend({
                     itemQuery: itemQuery,
                     query: query
                 }, data), callback);
             },
             keys: Ox.merge(
-                ['id', 'in', 'out', 'value'],
+                ['id', 'in', 'out', 'subtitles'], //fixme: could be other layer
                 !ui.item ? ['videoRatio'] : []
             ),
             max: 1,
@@ -178,4 +179,4 @@ pandora.ui.clipList = function(videoRatio) {
 
     return that;
 
-}
+}

static/js/pandora/ui/item.js

@@ -60,7 +60,7 @@ pandora.ui.item = function() {
                                     select: function(event) {
                                         pandora.$ui.clips.options({
                                             items: function(data, callback) {
-                                                pandora.api.findAnnotations(Ox.extend(data, {
+                                                pandora.api.findClips(Ox.extend(data, {
                                                     query: {
                                                         conditions:[{
                                                             key: 'event',

static/js/pandora/ui/list.js

@@ -245,11 +245,11 @@ pandora.ui.list = function() {
                         query.conditions.push({key: 'value', value: q.value, operator: q.operator});
                     }
                 });
-                pandora.api.findAnnotations(Ox.extend({
+                pandora.api.findClips(Ox.extend({
                     query: query,
                     itemQuery: itemQuery
                 }, range ? {
-                    keys: ['id', 'in', 'out'],
+                    keys: ['id', 'in', 'out', 'subtitles'],
                     range: range,
                     sort: pandora.user.ui.listSort
                 } : {}), function(result) {
@@ -355,7 +355,7 @@ pandora.ui.list = function() {
                 select: function(event) {
                     pandora.$ui.clips.options({
                         items: function(data, callback) {
-                            return pandora.api.findAnnotations(Ox.extend(data, {
+                            return pandora.api.findClips(Ox.extend(data, {
                                 query: {
                                     conditions:[{key: 'event',
                                                  value: event.id,

static/js/pandora/ui/mapView.js

@@ -54,7 +54,7 @@ pandora.ui.mapView = function(videoRatio) {
                                     operator: '&'
                                 };
                             }
-                            return pandora.api.findAnnotations(Ox.extend({
+                            return pandora.api.findClips(Ox.extend({
                                 itemQuery: itemQuery,
                                 query: {
                                     conditions: [{key: 'place', value: id, operator:'=='}],
@@ -221,4 +221,4 @@ pandora.ui.mapView = function(videoRatio) {
 
     return that;
 
-};
+};