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

cosmetic changes

Browse source
This commit is contained in:
rlx 2013-07-14 17:46:03 +00:00
parent dd9fd84bdf
commit 34a734e9f6
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

10
source/Ox.UI/js/Video/VideoElement.js
View file

@ -181,7 +181,7 @@ Ox.VideoElement = function(options, self) {
item.duration = item.out - item['in']; item.duration = item.out - item['in'];
} }
if (item.duration) { if (item.duration) {
if(!item.out) { if (!item.out) {
item.out = item.duration - item['in']; item.out = item.duration - item['in'];
} }
currentTime += item.duration; currentTime += item.duration;
@ -192,7 +192,7 @@ Ox.VideoElement = function(options, self) {
Ox.Log('VIDEO', 'getVideoInfo', item.src); Ox.Log('VIDEO', 'getVideoInfo', item.src);
Ox.getVideoInfo(item.src, function(info) { Ox.getVideoInfo(item.src, function(info) {
item.duration = info.duration; item.duration = info.duration;
if(!item.out) { if (!item.out) {
item.out = item['in'] + item.duration; item.out = item['in'] + item.duration;
} }
currentTime += item.duration; currentTime += item.duration;
@ -235,7 +235,7 @@ Ox.VideoElement = function(options, self) {
function setCurrentItem(item) { function setCurrentItem(item) {
Ox.Log('Video', 'sCI', item, self.numberOfItems); Ox.Log('Video', 'sCI', item, self.numberOfItems);
var interval; var interval;
if(item >= self.numberOfItems || item < 0) { if (item >= self.numberOfItems || item < 0) {
if (self.options.loop) { if (self.options.loop) {
item = Ox.mod(item, self.numberOfItems); item = Ox.mod(item, self.numberOfItems);
} else { } else {
@ -318,9 +318,9 @@ Ox.VideoElement = function(options, self) {
return false; return false;
} }
}); });
if(self.items.length) { if (self.items.length) {
// Set to end of items if time > duration // Set to end of items if time > duration
if(Ox.isUndefined(currentItem) && Ox.isUndefined(currentTime)) { if (Ox.isUndefined(currentItem) && Ox.isUndefined(currentTime)) {
currentItem = self.items.length -1; currentItem = self.items.length -1;
currentTime = self.items[currentItem].duration + self.items[currentItem]['in']; currentTime = self.items[currentItem].duration + self.items[currentItem]['in'];
} }

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

@ -2255,7 +2255,6 @@ Ox.VideoPlayer = function(options, self) {
} }
} }
function setVolume(volume) { function setVolume(volume) {
self.options.volume = volume; self.options.volume = volume;
if (!!self.options.volume == self.options.muted) { if (!!self.options.volume == self.options.muted) {