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

fall back to default edit settings

Browse source
This commit is contained in:
j 2023-06-24 14:29:09 +05:30
parent dffb47ffef
commit 068293050e
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
static/js/editPanel.js
View file

@ -73,6 +73,7 @@ pandora.ui.editPanel = function(isEmbed) {
if (ui.section != 'edits' || ui.edit != edit.id) { if (ui.section != 'edits' || ui.edit != edit.id) {
return; return;
} }
var editSettings = ui.edits[ui.edit] || pandora.site.editSettings
that = pandora.$ui.editPanel = Ox.VideoEditPanel({ that = pandora.$ui.editPanel = Ox.VideoEditPanel({
annotationsCalendarSize: ui.annotationsCalendarSize, annotationsCalendarSize: ui.annotationsCalendarSize,
annotationsMapSize: ui.annotationsMapSize, annotationsMapSize: ui.annotationsMapSize,
@ -83,7 +84,7 @@ pandora.ui.editPanel = function(isEmbed) {
clips: Ox.clone(edit.clips), clips: Ox.clone(edit.clips),
clipSize: ui.clipSize + Ox.UI.SCROLLBAR_SIZE, clipSize: ui.clipSize + Ox.UI.SCROLLBAR_SIZE,
clipTooltip: 'clips <span class="OxBright">' + Ox.SYMBOLS.shift + 'C</span>', clipTooltip: 'clips <span class="OxBright">' + Ox.SYMBOLS.shift + 'C</span>',
clipView: ui.edits[ui.edit].view, clipView: editSettings.view,
controlsTooltips: { controlsTooltips: {
open: Ox._('Open in {0} View', [Ox._(Ox.getObjectById( open: Ox._('Open in {0} View', [Ox._(Ox.getObjectById(
pandora.site.itemViews, pandora.user.ui.videoView pandora.site.itemViews, pandora.user.ui.videoView
@ -104,15 +105,15 @@ pandora.ui.editPanel = function(isEmbed) {
pandora.getLargeEditTimelineURL(edit, type, i, callback); pandora.getLargeEditTimelineURL(edit, type, i, callback);
}, },
height: pandora.$ui.appPanel.size(1), height: pandora.$ui.appPanel.size(1),
'in': ui.edits[ui.edit]['in'], 'in': editSettings['in'],
layers: getLayers(edit.clips), layers: getLayers(edit.clips),
loop: ui.videoLoop, loop: ui.videoLoop,
muted: ui.videoMuted, muted: ui.videoMuted,
out: ui.edits[ui.edit].out, out: editSettings.out,
position: ui.edits[ui.edit].position, position: editSettings.position,
resolution: ui.videoResolution, resolution: ui.videoResolution,
scaleToFill: ui.videoScale == 'fill', scaleToFill: ui.videoScale == 'fill',
selected: ui.edits[ui.edit].selection, selected: editSettings.selection,
showAnnotationsCalendar: ui.showAnnotationsCalendar, showAnnotationsCalendar: ui.showAnnotationsCalendar,
showAnnotationsMap: ui.showAnnotationsMap, showAnnotationsMap: ui.showAnnotationsMap,
showClips: ui.showClips, showClips: ui.showClips,
@ -120,7 +121,7 @@ pandora.ui.editPanel = function(isEmbed) {
showTimeline: ui.showTimeline, showTimeline: ui.showTimeline,
showUsers: pandora.site.annotations.showUsers, showUsers: pandora.site.annotations.showUsers,
smallTimelineURL: getSmallTimelineURL(), smallTimelineURL: getSmallTimelineURL(),
sort: ui.edits[ui.edit].sort, sort: editSettings.sort,
sortOptions: ( sortOptions: (
edit.type == 'static' edit.type == 'static'
? [{id: 'index', title: Ox._('Sort Manually'), operator: '+'}] ? [{id: 'index', title: Ox._('Sort Manually'), operator: '+'}]
@ -411,7 +412,7 @@ pandora.ui.editPanel = function(isEmbed) {
that.css('right', right); that.css('right', right);
updateSmallTimelineURL(); updateSmallTimelineURL();
ui.edits[ui.edit].view == 'grid' && enableDragAndDrop(); editSettings.view == 'grid' && enableDragAndDrop();
if (!Ox.Focus.focusedElementIsInput()) { if (!Ox.Focus.focusedElementIsInput()) {
that.gainFocus(); that.gainFocus();
} }
@ -464,12 +465,13 @@ pandora.ui.editPanel = function(isEmbed) {
} }
function renderEmbedEdit() { function renderEmbedEdit() {
var editSettings = ui.edits[ui.edit] || pandora.site.editSettings
that = Ox.VideoPlayer({ that = Ox.VideoPlayer({
clickLink: pandora.clickLink, clickLink: pandora.clickLink,
clipRatio: pandora.site.video.previewRatio, clipRatio: pandora.site.video.previewRatio,
clips: Ox.clone(edit.clips), clips: Ox.clone(edit.clips),
clipTooltip: 'clips <span class="OxBright">' + Ox.SYMBOLS.shift + 'C</span>', clipTooltip: 'clips <span class="OxBright">' + Ox.SYMBOLS.shift + 'C</span>',
clipView: ui.edits[ui.edit].view, clipView: editSettings.view,
controlsBottom: [ controlsBottom: [
'play', 'volume', 'scale', 'timeline', 'position', 'settings' 'play', 'volume', 'scale', 'timeline', 'position', 'settings'
], ],