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

clip list: handle embed links

Browse source
This commit is contained in:
rolux 2013-03-01 12:02:51 +00:00
parent 9a56f6ecc4
commit e053707ada
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
static/js/pandora/clipList.js
View file

@ -4,8 +4,6 @@
pandora.ui.clipList = function(videoRatio) { pandora.ui.clipList = function(videoRatio) {
//Ox.print('CLIP LIST FIND', !pandora.user.ui.item ? pandora.getItemFind(pandora.user.ui.find) : pandora.user.ui.itemFind);
var ui = pandora.user.ui, var ui = pandora.user.ui,
fixedRatio = !ui.item ? 16/9 : videoRatio, fixedRatio = !ui.item ? 16/9 : videoRatio,
isClipView = !ui.item ? ui.listView == 'clip' : ui.itemView == 'clips', isClipView = !ui.item ? ui.listView == 'clip' : ui.itemView == 'clips',
@ -118,6 +116,7 @@ pandora.ui.clipList = function(videoRatio) {
} }
}, },
open: function(data) { open: function(data) {
Ox.print(data.ids[0], '$$$$$', that.value(data.ids[0]))
var id = data.ids[0], var id = data.ids[0],
item = !ui.item ? id.split('/')[0] : ui.item, item = !ui.item ? id.split('/')[0] : ui.item,
points = { points = {
@ -126,17 +125,23 @@ pandora.ui.clipList = function(videoRatio) {
out: that.value(id, 'out'), out: that.value(id, 'out'),
position: that.value(id, 'in') position: that.value(id, 'in')
}, },
set;
if (isEmbed) {
// FIXME: This is wrong, see ticket #1333.
window.open('/' + item + '/' + points.annotation, '_blank');
} else {
set = { set = {
item: item, item: item,
itemView: pandora.user.ui.videoView itemView: pandora.user.ui.videoView
}; };
set['videoPoints.' + item] = Ox.extend(points, { set['videoPoints.' + item] = Ox.extend(points, {
position: points['in'] position: points['in']
}); });
if (['accessed', 'timesaccessed'].indexOf(ui.listSort[0].key) > -1) { if (['accessed', 'timesaccessed'].indexOf(ui.listSort[0].key) > -1) {
Ox.Request.clearCache('find'); Ox.Request.clearCache('find');
}
pandora.UI.set(set);
} }
pandora.UI.set(set);
}, },
openpreview: function(data) { openpreview: function(data) {
// on press space key // on press space key