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

itemsQuery/clipsQuery

Browse source
This commit is contained in:
j 2011-10-19 16:20:12 +00:00
commit 80ade383f9
11 changed files with 45 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

10
static/js/pandora/ui/clipList.js
View file

@ -48,19 +48,19 @@ pandora.ui.clipList = function(videoRatio) {
callback({data: {items: []}});
return;
}
var itemQuery, query;
var itemsQuery, query;
if (!ui.item) {
itemQuery = ui.find;
itemsQuery = ui.find;
query = {conditions: [], operator: '&'};
// if the item query contains a layer condition,
// then this condition is added to the clip query
itemQuery.conditions.forEach(function(condition) {
itemsQuery.conditions.forEach(function(condition) {
if (Ox.getPositionById(pandora.site.layers, condition.key) > -1) {
query.conditions.push(condition);
}
});
} else {
itemQuery = {
itemsQuery = {
conditions:[{key: 'id', value: ui.item, operator: '=='}],
operator: '&'
};
@ -69,7 +69,7 @@ pandora.ui.clipList = function(videoRatio) {
query = {conditions: [], operator: '&'};
}
pandora.api.findClips(Ox.extend({
itemQuery: itemQuery,
itemsQuery: itemsQuery,
query: query
}, data), callback);
},

6
static/js/pandora/ui/clipPlayer.js
View file

@ -11,17 +11,17 @@ pandora.ui.clipPlayer = function() {
video: function(range, callback) {
var callback = arguments[arguments.length - 1],
range = arguments.length == 2 ? arguments[0] : null,
itemQuery = pandora.user.ui.find,
itemsQuery = pandora.user.ui.find,
query = {conditions:[]};
//fixme: can this be in pandora.Query? dont just check for subtitles
itemQuery.conditions.forEach(function(q) {
itemsQuery.conditions.forEach(function(q) {
if (q.key == 'subtitles') {
query.conditions.push({key: 'subtitles', value: q.value, operator: q.operator});
}
});
pandora.api.findClips(Ox.extend({
query: query,
itemQuery: itemQuery
itemsQuery: itemsQuery
}, range ? {
keys: ['id', 'in', 'out', 'subtitles'],
range: range,

18
static/js/pandora/ui/navigationView.js
View file

@ -146,17 +146,17 @@ pandora.ui.navigationView = function(type, videoRatio) {
// 20 menu + 24 toolbar + 1 resizebar + 16 statusbar
height: window.innerHeight - ui.showGroups * ui.groupsSize - 61,
places: function(data, callback) {
var itemQuery;
var itemsQuery;
if (!ui.item) {
itemQuery = ui.find;
itemsQuery = ui.find;
} else {
itemQuery = {
itemsQuery = {
conditions: [{key: 'id', value: ui.item, operator: '=='}],
operator: '&'
};
}
return pandora.api.findPlaces(Ox.extend({
itemQuery: itemQuery
itemsQuery: itemsQuery
}, data), callback);
},
selected: ui.mapSelection,
@ -186,7 +186,7 @@ pandora.ui.navigationView = function(type, videoRatio) {
} else {
pandora.api.findEvents({
itemQuery: !ui.item ? ui.find : {
itemsQuery: !ui.item ? ui.find : {
conditions: [{key: 'id', value: ui.item, operator: '=='}],
operator: '&'
},
@ -233,17 +233,17 @@ pandora.ui.navigationView = function(type, videoRatio) {
$status.html('loading...');
$list.options({
items: function(data, callback) {
var itemQuery;
var itemsQuery;
if (!ui.item) {
itemQuery = ui.find;
itemsQuery = ui.find;
} else {
itemQuery = {
itemsQuery = {
conditions: [{key: 'id', value: ui.item, operator: '=='}],
operator: '&'
};
}
return pandora.api.findClips(Ox.extend({
itemQuery: itemQuery,
itemsQuery: itemsQuery,
query: {
conditions: [{key: itemName, value: id, operator:'=='}],
operator: '&'