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

cleanup Resizebar; make tooltips in VideoEditor, VideoPanel and VideoTimelinePanel configurable

Browse source
This commit is contained in:
rlx 2012-09-17 08:36:21 +00:00
commit 926410d663
4 changed files with 36 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -54,6 +54,7 @@ Ox.VideoEditor = function(options, self) {
annotationsRange: 'all',
annotationsSize: 256,
annotationsSort: 'position',
annotationsTooltip: 'annotations',
censored: [],
censoredIcon: '',
censoredTooltip: '',
@ -88,7 +89,6 @@ Ox.VideoEditor = function(options, self) {
subtitles: [],
timeline: '',
timelines: [],
tooltips: false,
videoRatio: 16/9,
videoSize: 'small',
video: '',
@ -829,7 +829,7 @@ Ox.VideoEditor = function(options, self) {
resizable: true,
resize: [192, 256, 320, 384, 448, 512],
size: self.options.annotationsSize,
tooltip: self.options.tooltips ? 'annotations' : false
tooltip: self.options.annotationsTooltip
}
],
orientation: 'horizontal'