diff --git a/static/js/pandora/infoView.padma.js b/static/js/pandora/infoView.padma.js index ef2932d7..9d66b8d7 100644 --- a/static/js/pandora/infoView.padma.js +++ b/static/js/pandora/infoView.padma.js @@ -41,6 +41,56 @@ pandora.ui.infoView = function(data) { $left = Ox.Element() .appendTo($info), + $preview = Ox.VideoPreview({ + duration: data.duration, + getFrame: function(position) { + var resolutions = pandora.site.video.resolutions.filter( + function(resolution, i) { + return resolution >= data.height; + }), + resolution = resolutions.length + ? Ox.min(resolutions) + : Ox.max(pandora.site.video.resolutions); + return '/' + data.id + '/' + resolution + 'p' + + (Ox.isUndefined(position) ? '' : position) + '.jpg'; + }, + frameRatio: data.videoRatio, + height: iconHeight, + width: iconWidth + }) + .css({ + position: 'absolute', + left: margin + iconLeft + 'px', + top: margin + 'px', + width: iconWidth + 'px', + height: iconHeight + 'px', + borderRadius: borderRadius + 'px', + background: 'rgb(0,0,0)' + }) + .bind({ + mouseleave: function() { + $icon.show(); + } + }) + .bindEvent({ + click: function(click) { + pandora.UI.set( + 'videoPoints.' + data.id, + {'in': 0, out: 0, position: click.position} + ); + if (ui.item && ['timeline', 'player', 'editor'].indexOf(ui.itemView) > -1) { + pandora.$ui[ui.itemView].options({ + position: click.position + }); + } else { + pandora.UI.set({ + item: data.id, + itemView: ui.videoView + }); + } + } + }) + .appendTo($left), $icon = Ox.Element({ element: '', }) @@ -58,11 +108,12 @@ pandora.ui.infoView = function(data) { borderRadius: borderRadius + 'px', cursor: 'pointer' }) - .bindEvent({ - singleclick: toggleIconSize + .bind({ + mouseenter: function() { + $icon.hide(); + } }) .appendTo($left), - $reflection = $('
') .addClass('OxReflection') .css({ diff --git a/static/js/pandora/videoPreview.js b/static/js/pandora/videoPreview.js index 771874b8..64bfba76 100644 --- a/static/js/pandora/videoPreview.js +++ b/static/js/pandora/videoPreview.js @@ -16,7 +16,6 @@ pandora.ui.videoPreview = function(data) { Ox.isUndefined(position) ? '' : position ) + '.jpg'; }, - frameCSS: data.frameCSS, frameRatio: data.frameRatio, height: data.height, position: data.position,