revised controls (find, volume)

This commit is contained in:
rolux 2011-05-16 20:05:29 +02:00
parent 6bc75c8627
commit 117c6bff62
4 changed files with 553 additions and 298 deletions

View file

@ -32,17 +32,17 @@ Ox.load('UI', {
videoSize = getVideoSize(), videoSize = getVideoSize(),
$videos = [ $videos = [
Ox.VideoPlayer({ Ox.VideoPlayer({
controls: ['play', 'mute', 'fullscreen', 'scale', 'timeline', 'position'], controlsBottom: ['play', 'volume', 'scale', 'timeline', 'position'],
controlsTop: ['fullscreen', 'title', 'find'],
enableFind: true, enableFind: true,
enableFullscreen: true, enableFullscreen: true,
enableKeyboard: true, enableKeyboard: true,
enableVolume: true,
focus: 'mouseenter', focus: 'mouseenter',
height: 192, height: 192,
'in': 3128.725,
logoLink: 'http://next.0xdb.org/' + id, logoLink: 'http://next.0xdb.org/' + id,
logoTitle: 'Watch on 0xdb', logoTitle: 'Watch on 0xdb',
logo: 'png/logo.png', logo: 'png/logo.png',
out: 3130.725,
paused: true, paused: true,
poster: poster, poster: poster,
showIconOnLoad: true, showIconOnLoad: true,
@ -51,7 +51,7 @@ Ox.load('UI', {
timeline: function(i) { timeline: function(i) {
return 'png/timeline.16.' + i + '.png'; return 'png/timeline.16.' + i + '.png';
}, },
title: '<b>Brick</b> - Rian Johnson - 2005', title: 'Brick - Rian Johnson - 2005',
video: url + '?' + + Ox.random(1000000), video: url + '?' + + Ox.random(1000000),
width: 360 width: 360
}) })
@ -78,9 +78,8 @@ Ox.load('UI', {
top: '16px' top: '16px'
}), }),
Ox.VideoPlayer({ Ox.VideoPlayer({
controls: ['play', 'playInToOut', 'mute', 'size', 'space', 'position'], controlsBottom: ['play', 'playInToOut', 'mute', 'size', 'space', 'position'],
externalControls: true, externalControls: true,
find: 'brick',
height: 192, height: 192,
'in': 3128.725, 'in': 3128.725,
out: 3130.725, out: 3130.725,

View file

@ -733,6 +733,11 @@ Ox.Input = function(options, self) {
} }
}; };
that.blurInput = function() {
self.$input.blur();
return that;
};
that.focusInput = function(select) { that.focusInput = function(select) {
select = Ox.isUndefined(select) ? true : select; select = Ox.isUndefined(select) ? true : select;
self.$input.focus(); self.$input.focus();

View file

@ -3,7 +3,7 @@ Ox.SmallVideoTimelineImage = function(options, self) {
self = self || {}; self = self || {};
var that = Ox.Element({}, self) var that = Ox.Element({}, self)
.defaults({ .defaults({
duration: 0, duration: 1920,
editing: false, editing: false,
getTimelineURL: null, getTimelineURL: null,
'in': 0, 'in': 0,
@ -120,7 +120,7 @@ Ox.SmallVideoTimelineImage = function(options, self) {
}); });
}); });
}); });
} else if (image == 'selection') { } else if (image == 'selection' && self.options.out > self.options['in']) {
var left = Math.round( var left = Math.round(
self.options['in'] * self.options.width / self.options.duration self.options['in'] * self.options.width / self.options.duration
), ),

File diff suppressed because it is too large Load diff