0x2620/oxjs
2
0
Fork 1
Code Issues 172 Pull requests Releases Wiki Activity

implement 'censored' option in timeline player

Browse source
This commit is contained in:
rlx 2012-04-18 11:21:06 +00:00
parent c70271573a
commit c7d8d68607
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
source/Ox.UI/js/Video/Ox.VideoTimelinePlayer.js
View file

@ -7,6 +7,7 @@ Ox.VideoTimelinePlayer = function(options, self) {
self = self || {}; self = self || {};
var that = Ox.Element({}, self) var that = Ox.Element({}, self)
.defaults({ .defaults({
censored: [],
cuts: [], cuts: [],
duration: 0, duration: 0,
find: '', find: '',
@ -256,15 +257,17 @@ Ox.VideoTimelinePlayer = function(options, self) {
}) })
.appendTo(self.$timelines[self.videoLines[1]][0]); .appendTo(self.$timelines[self.videoLines[1]][0]);
self.$frame = $('<img>') self.$frame = Ox.VideoPlayer({
.attr({ censored: self.options.censored,
src: self.options.getFrameURL(self.options.position) duration: self.options.duration,
height: self.tileHeight,
position: self.options.position,
scaleToFill: true,
type: 'in',
video: self.options.getFrameURL,
width: self.videoWidth
}) })
.css({ .appendTo(self.$frameBox);
width: self.videoWidth + 'px',
height: self.tileHeight + 'px',
})
.appendTo(self.$frameBox)
$('<div>') $('<div>')
.addClass('OxFrameInterface') .addClass('OxFrameInterface')
@ -292,6 +295,7 @@ Ox.VideoTimelinePlayer = function(options, self) {
.appendTo(self.$timelines[self.videoLines[0]][0]); .appendTo(self.$timelines[self.videoLines[0]][0]);
self.$video = Ox.VideoPlayer({ self.$video = Ox.VideoPlayer({
censored: self.options.censored,
duration: self.options.duration, duration: self.options.duration,
height: self.tileHeight, height: self.tileHeight,
paused: self.options.paused, paused: self.options.paused,
@ -588,12 +592,10 @@ Ox.VideoTimelinePlayer = function(options, self) {
isPlaying && self.$video.togglePaused(); isPlaying && self.$video.togglePaused();
} }
if (videoLines[0] != videoLines[1]) { if (videoLines[0] != videoLines[1]) {
self.$frame.attr({ self.$frame.options({
src: self.options.getFrameURL( position: self.paused
self.paused ? self.options.position
? self.options.position : Math.floor(self.options.position)
: Math.floor(self.options.position)
)
}); });
} }
if ( if (
@ -608,9 +610,7 @@ Ox.VideoTimelinePlayer = function(options, self) {
} }
if (!fromVideo) { if (!fromVideo) {
self.$video.options({position: self.options.position}); self.$video.options({position: self.options.position});
self.$frame.attr({ self.$frame.options({position: self.options.position});
src: self.options.getFrameURL(self.options.position)
});
scrollToPosition(); scrollToPosition();
} }
self.$smallTimeline.options({position: self.options.position}); self.$smallTimeline.options({position: self.options.position});