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

add 'DRM'

Browse source
This commit is contained in:
rlx 2011-10-22 21:03:42 +00:00
commit 1954a7a799
5 changed files with 123 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -15,6 +15,7 @@ Ox.VideoEditor = function(options, self) {
var that = Ox.Element({}, self)
.defaults({
annotationsSize: 0,
censored: [],
cuts: [],
duration: 0,
find: '',
@ -165,6 +166,7 @@ Ox.VideoEditor = function(options, self) {
['play', 'in', 'out'].forEach(function(type, i) {
self.$player[i] = Ox.VideoPlayer({
censored: self.options.censored,
controlsBottom: type == 'play' ?
['play', 'playInToOut', 'volume', 'size', 'space', 'position'] :
['goto', 'set', 'space', 'position'],