From 363ff25bb78aa790192434568d8438c4881f2a8b Mon Sep 17 00:00:00 2001 From: rolux Date: Tue, 17 Apr 2012 12:06:27 +0000 Subject: [PATCH] cosmetic changes in editor.js and player.js --- static/js/pandora/editor.js | 2 ++ static/js/pandora/player.js | 14 ++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/static/js/pandora/editor.js b/static/js/pandora/editor.js index d9328bb3..a8190093 100644 --- a/static/js/pandora/editor.js +++ b/static/js/pandora/editor.js @@ -4,6 +4,8 @@ pandora.ui.editor = function(data) { + // fixme: var ui = pandora.user.ui; + return Ox.VideoEditor({ annotationsCalendarSize: pandora.user.ui.annotationsCalendarSize, annotationsFont: pandora.user.ui.annotationsFont, diff --git a/static/js/pandora/player.js b/static/js/pandora/player.js index 2320fd6f..022b3281 100644 --- a/static/js/pandora/player.js +++ b/static/js/pandora/player.js @@ -4,6 +4,8 @@ pandora.ui.player = function(data) { + // fixme: var ui = pandora.user.ui; + return Ox.VideoPanel({ annotationsCalendarSize: pandora.user.ui.annotationsCalendarSize, annotationsFont: pandora.user.ui.annotationsFont, @@ -93,18 +95,18 @@ pandora.ui.player = function(data) { subtitles: function(data) { pandora.UI.set('videoSubtitles', data.subtitles); }, - togglemap: function(data) { - pandora.UI.set('showAnnotationsMap', !data.collapsed); - }, - togglesize: function(data) { - pandora.UI.set({videoSize: data.size}); - }, toggleannotations: function(data) { pandora.UI.set('showAnnotations', data.showAnnotations); }, togglelayer: function(data) { pandora.UI.set('showLayers.' + data.layer, !data.collapsed); }, + togglemap: function(data) { + pandora.UI.set('showAnnotationsMap', !data.collapsed); + }, + togglesize: function(data) { + pandora.UI.set({videoSize: data.size}); + }, toggletimeline: function(data) { pandora.UI.set('showTimeline', data.showTimeline); },