From 105e00917a9ea1e4292b216bc09505edca68473e Mon Sep 17 00:00:00 2001
From: j <j@mailb.org>
Date: Mon, 3 Oct 2016 12:45:52 +0200
Subject: [PATCH] use same video keys in all players

---
 static/js/embedPlayer.js   | 10 +++-------
 static/js/embedTimeline.js |  5 +----
 static/js/item.js          |  7 +------
 static/js/utils.js         | 18 ++++++++++++++++++
 4 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/static/js/embedPlayer.js b/static/js/embedPlayer.js
index 69f82ec1..514a6960 100644
--- a/static/js/embedPlayer.js
+++ b/static/js/embedPlayer.js
@@ -26,16 +26,12 @@ pandora.ui.embedPlayer = function() {
         $innerPanel, $outerPanel,
         $title, $player, $controls, $timeline, $annotations;
 
-    pandora.api.get({id: ui.item, keys: [
-        'duration', 'durations', 'layers', 'parts', 'posterFrame',
-        'rightslevel', 'size', 'title', 'videoRatio'
-    ]}, function(result) {
+    pandora.api.get({id: ui.item, keys: pandora.VIDEO_OPTIONS_KEYS}, function(result) {
         if (removed) {
             return;
         }
         video = Ox.extend(result.data, pandora.getVideoOptions(result.data));
 
-        Ox.print('OPTIONS::::::::', options)
         var isFrame = options['in'] && options['in'] == options.out,
             sizes = getSizes();
 
@@ -363,8 +359,8 @@ pandora.ui.embedPlayer = function() {
 
     that.resizePanel = function() {
         var sizes = getSizes();
-        $player.options({width: window.innerWidth, height: sizes.videoHeight});
-        $outerPanel.size(0, sizes.innerHeight);
+        $player && $player.options({width: window.innerWidth, height: sizes.videoHeight});
+        $outerPanel && $outerPanel.size(0, sizes.innerHeight);
         options.showTimeline && $timeline.options({width: window.innerWidth - 16});
         options.showAnnotations && $annotations.options({width: window.innerWidth});
         return that;
diff --git a/static/js/embedTimeline.js b/static/js/embedTimeline.js
index 31d47ed9..7d243590 100644
--- a/static/js/embedTimeline.js
+++ b/static/js/embedTimeline.js
@@ -19,10 +19,7 @@ pandora.ui.embedTimeline = function() {
         video,
         $title, $panel, $player, $annotations;
 
-    pandora.api.get({id: ui.item, keys: [
-        'duration', 'durations', 'layers', 'parts', 'posterFrame',
-        'rightslevel', 'size', 'title', 'videoRatio'
-    ]}, function(result) {
+    pandora.api.get({id: ui.item, keys: pandora.VIDEO_OPTIONS_KEYS}, function(result) {
         if (removed) {
             return;
         }
diff --git a/static/js/item.js b/static/js/item.js
index 5dad4abf..1fa5ee1d 100644
--- a/static/js/item.js
+++ b/static/js/item.js
@@ -12,12 +12,7 @@ pandora.ui.item = function() {
 
     pandora.api.get({
         id: pandora.user.ui.item,
-        keys: isVideoView ? [
-            'audioTracks',
-            'cuts', 'duration', 'durations', 'editable', 'layers',
-            'modified', 'parts', 'posterFrame', 'rendered', 'rightslevel',
-            'streams', 'size', 'videoRatio',
-        ].concat(pandora.site.itemTitleKeys) : []
+        keys: isVideoView ? Ox.unique(pandora.VIDEO_OPTIONS_KEYS.concat(pandora.site.itemTitleKeys)) : []
     }, pandora.user.ui.itemView == 'info' && pandora.site.capabilities.canEditMetadata[pandora.user.level] ? 0 : -1, function(result) {
 
         if (pandora.user.ui.item != item) {
diff --git a/static/js/utils.js b/static/js/utils.js
index 673dee97..e9a30610 100644
--- a/static/js/utils.js
+++ b/static/js/utils.js
@@ -2011,6 +2011,24 @@ pandora.getCensoredClips = function(data) {
         });
 };
 
+pandora.VIDEO_OPTIONS_KEYS = [
+    'audioTracks',
+    'cuts',
+    'duration',
+    'durations',
+    'editable',
+    'layers',
+    'modified',
+    'parts',
+    'posterFrame',
+    'rendered',
+    'rightslevel',
+    'size',
+    'streams',
+    'title',
+    'videoRatio'
+];
+
 pandora.getVideoOptions = function(data) {
     var canPlayClips = data.editable
             || pandora.site.capabilities.canPlayClips[pandora.user.level]