From d520582f0010771fc74d5ed994352309b483d173 Mon Sep 17 00:00:00 2001 From: rolux Date: Sat, 16 Feb 2013 12:50:20 +0530 Subject: [PATCH] in embed player, support position option --- static/js/embed/pandora.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/static/js/embed/pandora.js b/static/js/embed/pandora.js index 430497a9a..884b9387e 100755 --- a/static/js/embed/pandora.js +++ b/static/js/embed/pandora.js @@ -51,7 +51,12 @@ Ox.load('UI', { invertHighlight: options.invertHighlight, paused: options.paused, playInToOut: options.playInToOut, - poster: '/' + options.item + '/' + '96p' + data.posterFrame +'.jpg', + position: options.position || 0, + poster: '/' + options.item + '/' + '96p' + ( + options.position !== void 0 ? options.position + : options['in'] !== void 0 ? options['in'] + : data.posterFrame + ) +'.jpg', resolution: pandora.user.ui.videoResolution, showMarkers: false, showMilliseconds: 0, @@ -66,8 +71,6 @@ Ox.load('UI', { width: window.innerWidth }, options['in'] ? { 'in': options['in'], - position: options['in'], - poster: '/' + options.item + '/' + '96p' + options['in'] +'.jpg', } : {}, options.out ? { out: options.out } : {})) @@ -284,6 +287,9 @@ Ox.load('UI', { } }); options = Ox.extend({}, defaults, query); + if (!options.position) { + options.position = options['in'] || 0; + } if (!options['in'] && !options.out) { options.playInToOut = false; }