0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

always include 'Go to Poster Frame' in editor view, fixes #667

Browse source
This commit is contained in:
rolux 2012-04-23 09:54:38 +00:00
parent 4daa931a3c
commit 9e8924683c
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
static/js/pandora/editor.js
View file

@ -21,6 +21,7 @@ pandora.ui.editor = function(data) {
duration: data.duration, duration: data.duration,
enableDownload: pandora.site.capabilities.canDownloadVideo[pandora.user.level] >= data.rightslevel, enableDownload: pandora.site.capabilities.canDownloadVideo[pandora.user.level] >= data.rightslevel,
enableImport: pandora.site.capabilities.canImportAnnotations[pandora.user.level], enableImport: pandora.site.capabilities.canImportAnnotations[pandora.user.level],
enableSetPosterFrame: !pandora.site.media.importFrames && data.editable,
enableSubtitles: pandora.user.ui.videoSubtitles, enableSubtitles: pandora.user.ui.videoSubtitles,
find: pandora.user.ui.itemFind, find: pandora.user.ui.itemFind,
getFrameURL: function(position) { getFrameURL: function(position) {
@ -46,7 +47,6 @@ pandora.ui.editor = function(data) {
out: pandora.user.ui.videoPoints[pandora.user.ui.item].out, out: pandora.user.ui.videoPoints[pandora.user.ui.item].out,
position: pandora.user.ui.videoPoints[pandora.user.ui.item].position, position: pandora.user.ui.videoPoints[pandora.user.ui.item].position,
posterFrame: data.posterFrame, posterFrame: data.posterFrame,
posterFrameControls: !pandora.site.media.importFrames,
resolution: pandora.user.ui.videoResolution, resolution: pandora.user.ui.videoResolution,
selected: pandora.user.ui.videoPoints[pandora.user.ui.item].annotation selected: pandora.user.ui.videoPoints[pandora.user.ui.item].annotation
? pandora.user.ui.item + '/' + pandora.user.ui.videoPoints[pandora.user.ui.item].annotation ? pandora.user.ui.item + '/' + pandora.user.ui.videoPoints[pandora.user.ui.item].annotation

4
static/js/pandora/item.js
View file

@ -11,7 +11,7 @@ pandora.ui.item = function() {
pandora.api.get({ pandora.api.get({
id: pandora.user.ui.item, id: pandora.user.ui.item,
keys: isVideoView ? [ keys: isVideoView ? [
'cuts', 'director', 'duration', 'layers', 'cuts', 'director', 'duration', 'editable', 'layers',
'parts', 'posterFrame', 'rendered', 'rightslevel', 'parts', 'posterFrame', 'rendered', 'rightslevel',
'size', 'title', 'videoRatio', 'year' 'size', 'title', 'videoRatio', 'year'
] : [] ] : []
@ -64,7 +64,7 @@ pandora.ui.item = function() {
} else if (pandora.user.ui.itemView == 'info') { } else if (pandora.user.ui.itemView == 'info') {
if (pandora.user.level == 'admin' && false) { if (pandora.user.level == 'admin' && false) { // FIXME!!
var $form, var $form,
$edit = Ox.Element() $edit = Ox.Element()
.append($form = Ox.FormElementGroup({ .append($form = Ox.FormElementGroup({