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

use new form element syntax, continued

Browse source
This commit is contained in:
rlx 2011-12-22 15:47:46 +00:00
commit 02f53a57c1
15 changed files with 107 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -22,6 +22,7 @@ Ox.VideoEditor = function(options, self) {
censored: [],
cuts: [],
duration: 0,
enableSubtitles: false,
find: '',
fps: 25,
getFrameURL: null,
@ -181,6 +182,7 @@ Ox.VideoEditor = function(options, self) {
duration: self.options.duration,
enableMouse: true,
enablePosition: true,
enableSubtitles: self.options.enableSubtitles,
externalControls: true,
find: self.options.find,
height: self.sizes.player[i].height,
@ -221,6 +223,9 @@ Ox.VideoEditor = function(options, self) {
that.triggerEvent('resolution', data);
},
size: toggleSize,
subtitles: function(data) {
that.triggerEvent('subtitles', data);
},
volume: function(data) {
that.triggerEvent('volume', data);
}

7
source/Ox.UI/js/Video/Ox.VideoPanelPlayer.js
View file

@ -19,6 +19,7 @@ Ox.VideoPanelPlayer = function(options, self) {
annotationsSize: 256,
censored: [],
duration: 0,
enableSubtitles: false,
find: '',
fullscreen: false,
height: 0,
@ -64,11 +65,12 @@ Ox.VideoPanelPlayer = function(options, self) {
self.$video = Ox.VideoPlayer({
censored: self.options.censored,
controlsTop: ['fullscreen', 'title', 'find'],
controlsBottom: ['play', 'volume', 'scale', 'timeline', 'position', 'resolution'],
controlsBottom: ['play', 'volume', 'scale', 'timeline', 'position', 'settings'],
enableFind: true,
enableKeyboard: true,
enableMouse: true,
enablePosition: true,
enableSubtitles: self.options.enableSubtitles,
enableTimeline: true,
find: self.options.find,
fullscreen: self.options.fullscreen,
@ -111,6 +113,9 @@ Ox.VideoPanelPlayer = function(options, self) {
scale: function(data) {
that.triggerEvent('scale', data);
},
subtitles: function(data) {
that.triggerEvent('subtitles', data);
},
volume: function(data) {
that.triggerEvent('volume', data);
}