From 86cf90fa82005c800a99baaaec014f4ce745fbfa Mon Sep 17 00:00:00 2001 From: rolux Date: Fri, 7 Feb 2014 06:21:18 +0000 Subject: [PATCH] edit panel: don't render if not in edits section, only editable if edit is static, pass item name --- static/js/editPanel.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/static/js/editPanel.js b/static/js/editPanel.js index c6190dfcf..da086d156 100644 --- a/static/js/editPanel.js +++ b/static/js/editPanel.js @@ -78,6 +78,9 @@ pandora.ui.editPanel = function() { } function renderEdit() { + if (ui.section != 'edits') { + return; + } that = pandora.$ui.editPanel = Ox.VideoEditPanel({ annotationsCalendarSize: ui.annotationsCalendarSize, annotationsFont: ui.annotationsFont, @@ -92,7 +95,7 @@ pandora.ui.editPanel = function() { clipTooltip: 'clips ' + Ox.SYMBOLS.SHIFT + 'C', clipView: ui.edits[ui.edit].view, duration: edit.duration, - editable: edit.editable, + editable: edit.type == 'static' && edit.editable, enableSubtitles: ui.videoSubtitles, fullscreen: false, getClipImageURL: function(id, width, height) { @@ -104,6 +107,7 @@ pandora.ui.editPanel = function() { }, height: pandora.$ui.appPanel.size(1), 'in': ui.edits[ui.edit]['in'], + itemName: pandora.site.itemName.singular, layers: getLayers(edit.clips), loop: ui.videoLoop, muted: ui.videoMuted,