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

Compare commits

base: 0x2620:068293050ed078c4b3587f94ff196d18665dc840
Branches Tags
0x2620:master
0x2620:stable
..
compare: 0x2620:9c3edac2632219f16ea1b55ba43ece10785d0d43
Branches Tags
0x2620:master
0x2620:stable

No commits in common. "068293050ed078c4b3587f94ff196d18665dc840" and "9c3edac2632219f16ea1b55ba43ece10785d0d43" have entirely different histories.
068293050e ... 9c3edac263

2 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
static/js/editPanel.js
View file

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

2
static/js/folderList.js
View file

@ -411,7 +411,7 @@ pandora.ui.folderList = function(id, section) {
});
},
paste: function() {
pandora.$ui.list && pandora.$ui.list.triggerEvent('paste');
pandora.$ui.list.triggerEvent('paste');
},
select: function(data) {
var list = data.ids.length ? data.ids[0] : '';