From 8067fd4629206ea05c957ec6b6d8dbeca16246c7 Mon Sep 17 00:00:00 2001
From: rolux <rolux@rolux.org>
Date: Sat, 2 Mar 2013 12:10:37 +0530
Subject: [PATCH] embed player: cleanup, post 'loaded' message later

---
 static/js/pandora/embedPlayer.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/static/js/pandora/embedPlayer.js b/static/js/pandora/embedPlayer.js
index 52b2aecf..f54d514d 100644
--- a/static/js/pandora/embedPlayer.js
+++ b/static/js/pandora/embedPlayer.js
@@ -90,7 +90,7 @@ pandora.ui.embedPlayer = function() {
                 enableVolume: !isFrame,
                 height: options.height,
                 invertHighlight: options.invertHighlight,
-                muted: pandora.user.ui.videoMuted,
+                muted: ui.videoMuted,
                 paused: options.paused,
                 playInToOut: options.playInToOut,
                 position: options.position,
@@ -99,8 +99,8 @@ pandora.ui.embedPlayer = function() {
                     : options['in'] !== void 0 ? options['in']
                     : video.posterFrame
                 ) +'.jpg',
-                resolution: pandora.user.ui.videoResolution,
-                scaleToFill: pandora.user.ui.videoScale == 'fill',
+                resolution: ui.videoResolution,
+                scaleToFill: ui.videoScale == 'fill',
                 subtitles: video.subtitles,
                 timeline: options.playInToOut ? function(size, i) {
                     return '/' + options.item
@@ -113,7 +113,7 @@ pandora.ui.embedPlayer = function() {
                     ? pandora.site.timelines : [],
                 title: video.title,
                 video: video.video,
-                volume: pandora.user.ui.videoVolume,
+                volume: ui.videoVolume,
                 width: options.width
             }, options['in'] ? {
                 'in': options['in']
@@ -244,6 +244,8 @@ pandora.ui.embedPlayer = function() {
 
         that.setElement($outerPanel);
 
+        Ox.$parent.postMessage('loaded');
+
     });
 
     function changeTimeline(data) {
@@ -327,8 +329,6 @@ pandora.ui.embedPlayer = function() {
         return that;
     };
 
-    Ox.$parent.postMessage('loaded');
-
     return that;
 
 };
\ No newline at end of file