sanj/oxjs
1
0
Fork 0
forked from 0x2620/oxjs
Code Pull requests Activity

update video editor (places, events)

Browse source
This commit is contained in:
rlx 2012-01-13 21:55:47 +05:30
commit 8384fcc913
13 changed files with 346 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

8
source/Ox.UI/js/Video/Ox.VideoEditor.js
View file

@ -18,7 +18,9 @@ Ox.VideoEditor = function(options, self) {
self = self || {};
var that = Ox.Element({}, self)
.defaults({
annotationsCalendarSize: 256,
annotationsFont: 'small',
annotationsMapSize: 256,
annotationsRange: 'all',
annotationsSize: 256,
annotationsSort: 'position',
@ -42,6 +44,8 @@ Ox.VideoEditor = function(options, self) {
resolution: 0,
selected: '',
showAnnotations: false,
showAnnotationsCalendar: false,
showAnnotationsMap: false,
showLargeTimeline: true,
showLayers: {},
showUsers: false,
@ -588,16 +592,20 @@ Ox.VideoEditor = function(options, self) {
.appendTo(self.$menubar.$element);
self.$annotationPanel = Ox.AnnotationPanel({
calendarSize: self.options.annotationsCalendarSize,
editable: true,
font: self.options.annotationsFont,
'in': self.options['in'],
layers: self.options.layers,
mapSize: self.options.annotationsMapSize,
out: self.options.out,
position: self.options.position,
range: self.options.annotationsRange,
selected: self.options.selected,
sort: self.options.annotationsSort,
showCalendar: self.options.showAnnotationsCalendar,
showLayers: self.options.showLayers,
showMap: self.options.showAnnotationsMap,
showUsers: self.options.showUsers,
width: self.options.annotationsSize
})