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

update video editor (places, events)

Browse source
This commit is contained in:
rolux 2012-01-13 21:56:07 +05:30
commit 81548bba04
4 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -218,7 +218,9 @@ pandora.ui.item = function() {
} else if (pandora.user.ui.itemView == 'timeline') {
pandora.$ui.contentPanel.replaceElement(1,
pandora.$ui.editor = Ox.VideoEditor({
annotationsCalendarSize: pandora.user.ui.annotationsCalendarSize,
annotationsFont: pandora.user.ui.annotationsFont,
annotationsMapSize: pandora.user.ui.annotationsMapSize,
annotationsRange: pandora.user.ui.annotationsRange,
annotationsSize: pandora.user.ui.annotationsSize,
annotationsSort: pandora.user.ui.annotationsSort,
@ -254,6 +256,8 @@ pandora.ui.item = function() {
? pandora.user.ui.item + '/' + pandora.user.ui.videoPoints[pandora.user.ui.item].annotation
: '',
showAnnotations: pandora.user.ui.showAnnotations,
showAnnotationsCalendar: pandora.user.ui.showAnnotationsCalendar,
showAnnotationsMap: pandora.user.ui.showAnnotationsMap,
showLargeTimeline: true,
showLayers: pandora.user.ui.showLayers,
showUsers: pandora.site.annotations.showUsers,
@ -344,6 +348,8 @@ pandora.ui.item = function() {
value: data.value,
}, function(result) {
Ox.Log('', 'editAnnotation result', result);
result.data.duration = result.data.out - result.data['in'];
pandora.$ui.editor.updateAnnotation(data.layer, result.data);
});
},
removeannotation: function(data) {

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

@ -165,6 +165,8 @@ pandora.ui.navigationView = function(type, videoRatio) {
height: window.innerHeight - ui.showFilters * ui.filtersSize - 61,
range: [-5000, 5000],
showControls: ui.showCalendarControls,
showToolbar: true,
showZoombar: true,
width: window.innerWidth - ui.showSidebar * ui.sidebarSize - listSize - 2,
zoom: 4
})