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

update VideoEditor/AnnotationPanel/Editable/...; update OxJS array functions

Browse source
This commit is contained in:
rlx 2012-01-04 01:11:50 +05:30
commit 85652471c6
8 changed files with 280 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -21,6 +21,7 @@ Ox.VideoEditor = function(options, self) {
annotationsFont: 'small',
annotationsRange: 'all',
annotationsSize: 0,
annotationsSort: 'position',
censored: [],
cuts: [],
duration: 0,
@ -312,6 +313,7 @@ Ox.VideoEditor = function(options, self) {
out: self.options.out,
position: self.options.position,
range: self.options.annotationsRange,
sort: self.options.annotationsSort,
width: self.options.annotationsSize - Ox.UI.SCROLLBAR_SIZE
}, layer)
)
@ -637,6 +639,13 @@ Ox.VideoEditor = function(options, self) {
{id: 'all', title: 'All', checked: self.options.annotationsRange == 'all'}
]},
{},
{id: 'sortannotations', title: 'Sort Annotations', disabled: true},
{group: 'sort', min: 1, max: 1, items: [
{id: 'position', title: 'By Position', checked: self.options.annotationsSort == 'position'},
{id: 'duration', title: 'By Duration', checked: self.options.annotationsSort == 'duration'},
{id: 'text', title: 'By Text', checked: self.options.annotationsSort == 'text'}
]},
{},
{id: 'fontsize', title: 'Font Size', disabled: true},
{group: 'font', min: 1, max: 1, items: [
{id: 'small', title: 'Small', checked: self.options.annotationsFont == 'small'},
@ -911,7 +920,7 @@ Ox.VideoEditor = function(options, self) {
}
function selectAnnotation(data) {
setPosition(data['in']);
//setPosition(data['in']);
setPoint('in', data['in']);
setPoint('out', data.out);
}