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

rename various options of video widgets to allow for different timeline types

Browse source
This commit is contained in:
rlx 2012-04-18 07:43:32 +00:00
commit 132e8d2207
10 changed files with 90 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -23,7 +23,7 @@ Ox.VideoTimelinePanel = function(options, self) {
duration: 0,
followPlayer: false,
getFrameURL: null,
getTimelineImageURL: null,
getLargeTimelineURL: null,
height: 0,
layers: [],
loop: false, // fixme: used?
@ -38,9 +38,9 @@ Ox.VideoTimelinePanel = function(options, self) {
showAnnotationsMap: false,
showLayers: {},
showUsers: false,
smallTimelineURL: '',
subtitles: [],
timeline: '',
timelineImageURL: '',
timelines: [],
video: '',
volume: 1,
@ -69,15 +69,15 @@ Ox.VideoTimelinePanel = function(options, self) {
duration: self.options.duration,
followPlayer: self.options.followPlayer,
getFrameURL: self.options.getFrameURL,
getTimelineImageURL: self.options.getTimelineImageURL,
getLargeTimelineURL: self.options.getLargeTimelineURL,
height: self.options.height,
muted: self.options.muted,
paused: true,
position: self.options.position,
resolution: self.options.resolution,
smallTimelineURL: self.options.smallTimelineURL,
subtitles: self.options.subtitles,
timeline: self.options.timeline,
timelineImageURL: self.options.timelineImageURL,
timelines: self.options.timelines,
video: self.options.video,
videoRatio: self.options.videoRatio,
@ -100,6 +100,9 @@ Ox.VideoTimelinePanel = function(options, self) {
position: function(data) {
setPosition(data.position);
},
timeline: function(data) {
that.triggerEvent('timeline', data);
},
volume: function(data) {
that.triggerEvent('volume', data);
}