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

add annotations view to edits

Browse source
This commit is contained in:
j 2014-01-22 18:22:12 +00:00
commit eac549224e
2 changed files with 68 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

23
source/Ox.UI/js/Video/VideoEditPanel.js
View file

@ -5,6 +5,12 @@ Ox.VideoEditPanel = function(options, self) {
self = self || {};
var that = Ox.Element({}, self)
.defaults({
annotationsCalendarSize: 256,
annotationsFont: 'small',
annotationsMapSize: 256,
annotationsRange: 'all',
annotationsSize: 256,
annotationsSort: 'position',
clips: [],
clipSize: 256,
clipSort: [],
@ -22,6 +28,7 @@ Ox.VideoEditPanel = function(options, self) {
height: 0,
'in': 0,
loop: false,
layers: [],
muted: false,
out: 0,
paused: true,
@ -30,8 +37,12 @@ Ox.VideoEditPanel = function(options, self) {
resolution: 0,
scaleToFill: false,
selected: [],
showAnnotationsCalendar: false,
showAnnotationsMap: false,
showClips: false,
showLayers: {},
showTimeline: false,
showUsers: false,
smallTimelineURL: '',
subtitles: [],
timeline: '',
@ -283,14 +294,26 @@ Ox.VideoEditPanel = function(options, self) {
});
self.$clipPanel = Ox.ClipPanel({
annotationsCalendarSize: self.options.annotationsCalendarSize,
annotationsFont: self.options.annotationsFont,
annotationsMapSize: self.options.annotationsMapSize,
annotationsRange: self.options.annotationsRange,
annotationsSize: self.options.annotationsSize,
annotationsSort: self.options.annotationsSort,
clips: Ox.clone(self.options.clips),
clickLink: self.options.clickLink,
duration: self.options.duration,
editable: self.options.editable,
getClipImageURL: self.options.getClipImageURL,
'in': self.options['in'],
layers: Ox.clone(self.options.layers),
out: self.options.out,
position: self.options.position,
selected: self.options.selected,
showAnnotationsCalendar: self.options.showAnnotationsCalendar,
showAnnotationsMap: self.options.showAnnotationsMap,
showLayers: self.options.showLayers,
showUsers: self.options.showUsers,
sort: self.options.clipSort,
sortOptions: self.options.sortOptions,
view: self.options.clipView,