diff --git a/source/Ox.UI/js/Video/VideoEditPanel.js b/source/Ox.UI/js/Video/VideoEditPanel.js index 7df41e9c..fa89cdb2 100644 --- a/source/Ox.UI/js/Video/VideoEditPanel.js +++ b/source/Ox.UI/js/Video/VideoEditPanel.js @@ -134,7 +134,10 @@ Ox.VideoEditPanel = function(options, self) { self.$video = Ox.VideoPlayer({ 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, enableMouse: true, enablePosition: true, diff --git a/source/Ox.UI/js/Video/VideoElement.js b/source/Ox.UI/js/Video/VideoElement.js index 5bff36f0..6c3336fe 100644 --- a/source/Ox.UI/js/Video/VideoElement.js +++ b/source/Ox.UI/js/Video/VideoElement.js @@ -181,7 +181,7 @@ Ox.VideoElement = function(options, self) { item.duration = item.out - item['in']; } if (item.duration) { - if(!item.out) { + if (!item.out) { item.out = item.duration - item['in']; } currentTime += item.duration; @@ -192,7 +192,7 @@ Ox.VideoElement = function(options, self) { Ox.Log('VIDEO', 'getVideoInfo', item.src); Ox.getVideoInfo(item.src, function(info) { item.duration = info.duration; - if(!item.out) { + if (!item.out) { item.out = item['in'] + item.duration; } currentTime += item.duration; @@ -235,7 +235,7 @@ Ox.VideoElement = function(options, self) { function setCurrentItem(item) { Ox.Log('Video', 'sCI', item, self.numberOfItems); var interval; - if(item >= self.numberOfItems || item < 0) { + if (item >= self.numberOfItems || item < 0) { if (self.options.loop) { item = Ox.mod(item, self.numberOfItems); } else { @@ -318,9 +318,9 @@ Ox.VideoElement = function(options, self) { return false; } }); - if(self.items.length) { + if (self.items.length) { // 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; currentTime = self.items[currentItem].duration + self.items[currentItem]['in']; } diff --git a/source/Ox.UI/js/Video/VideoPlayer.js b/source/Ox.UI/js/Video/VideoPlayer.js index 604f7f21..814e152b 100644 --- a/source/Ox.UI/js/Video/VideoPlayer.js +++ b/source/Ox.UI/js/Video/VideoPlayer.js @@ -2255,7 +2255,6 @@ Ox.VideoPlayer = function(options, self) { } } - function setVolume(volume) { self.options.volume = volume; if (!!self.options.volume == self.options.muted) {