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

VideoPlayer: fix loop while playing in to out; VideoEditPanel: add play in to out control

Browse source
This commit is contained in:
rlx 2013-07-14 17:58:45 +00:00
parent 34a734e9f6
commit 19b9b14dfc
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -135,7 +135,7 @@ Ox.VideoEditPanel = function(options, self) {
self.$video = Ox.VideoPlayer({ self.$video = Ox.VideoPlayer({
controlsTop: ['fullscreen', 'space', 'open'], controlsTop: ['fullscreen', 'space', 'open'],
controlsBottom: [ controlsBottom: [
'play', 'volume', 'scale', 'timeline', 'play', 'playInToOut', 'volume', 'scale', 'timeline',
'previous', 'next', 'loop', 'position', 'settings' 'previous', 'next', 'loop', 'position', 'settings'
], ],
enableKeyboard: true, enableKeyboard: true,

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

@ -1878,7 +1878,7 @@ Ox.VideoPlayer = function(options, self) {
|| (self.options.playInToOut && self.options.position >= self.out) || (self.options.playInToOut && self.options.position >= self.out)
) { ) {
if (self.options.loop) { if (self.options.loop) {
rewind(); setPosition(self.options['in']);
self.$video.play(); self.$video.play();
} else { } else {
togglePaused(); togglePaused();