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

minor fixes

Browse source
This commit is contained in:
rolux 2011-05-17 09:43:20 +02:00
parent bed3e1ea70
commit e60ac585d4
2 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
demos/video/js/video.js
View file

@ -160,7 +160,7 @@ Ox.load('UI', {
$videos[2].options({height: size - 48}); $videos[2].options({height: size - 48});
} }
}), }),
size: 240, size: 320,
resizable: true, resizable: true,
resize: [100, 400] resize: [100, 400]
}, },

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

@ -476,9 +476,7 @@ Ox.VideoPlayer = function(options, self) {
}) })
.css({float: 'left'}) .css({float: 'left'})
.bindEvent({ .bindEvent({
click: function() { click: toggleFind
self.$find.hide();
}
}) })
.appendTo(self.$find); .appendTo(self.$find);
@ -751,8 +749,8 @@ Ox.VideoPlayer = function(options, self) {
type: 'image' type: 'image'
}) })
.css({float: 'left'}) .css({float: 'left'})
.bindEvent('click', function() { .bindEvent({
self.$volume.toggle(); click: toggleVolume
}) })
.appendTo(self['$controls' + titlecase]); .appendTo(self['$controls' + titlecase]);
@ -792,9 +790,7 @@ Ox.VideoPlayer = function(options, self) {
}) })
.css({float: 'left'}) .css({float: 'left'})
.bindEvent({ .bindEvent({
click: function() { click: toggleVolume
self.$volume.hide();
}
}) })
.appendTo(self.$volume); .appendTo(self.$volume);
@ -944,14 +940,19 @@ Ox.VideoPlayer = function(options, self) {
height: logoHeight + 'px', height: logoHeight + 'px',
}; };
} else if (element == 'player') { } else if (element == 'player') {
var height = self.options.fullscreen ? window.innerHeight : self.height;
if (self.options.externalControls) {
height += (
!!self.options.controlsTop.length +
!!self.options.controlsBottom.length
) * self.barHeight;
}
if (self.options.largeTimeline) {
height += 64;
}
css = Ox.extend({ css = Ox.extend({
width: self.width + 'px', width: self.width + 'px',
height: (self.options.fullscreen height: height + 'px'
? window.innerHeight
: self.height + (
self.options.externalControls
? (!!self.options.controlsTop.length + !!self.options.controlsBottom.length) * self.barHeight
: 0)) + 'px'
}, self.options.fullscreen ? { }, self.options.fullscreen ? {
left: 0, left: 0,
top: 0 top: 0
@ -1499,7 +1500,6 @@ Ox.VideoPlayer = function(options, self) {
if (!found) { if (!found) {
position = self.results[direction == 1 ? 0 : self.results.length - 1]['in']; position = self.results[direction == 1 ? 0 : self.results.length - 1]['in'];
} }
Ox.print('>>', self.results, position)
setPosition(position + self.secondsPerFrame, true); setPosition(position + self.secondsPerFrame, true);
} }
@ -1519,8 +1519,10 @@ Ox.VideoPlayer = function(options, self) {
} }
function toggleFind() { function toggleFind() {
var show = self.$find.is(':hidden');
!show && self.$findInput.blurInput();
self.$find.toggle(); self.$find.toggle();
self.$find.is(':visible') && self.$findInput.focusInput(false); show && self.$findInput.focusInput(false);
} }
function toggleFullscreen(toggleButton) { function toggleFullscreen(toggleButton) {
@ -1671,6 +1673,10 @@ Ox.VideoPlayer = function(options, self) {
}); });
} }
function toggleVolume() {
self.$volume.toggle();
}
self.setOption = function(key, value) { self.setOption = function(key, value) {
if (key == 'fullscreen') { if (key == 'fullscreen') {
toggleFullscreen(true); toggleFullscreen(true);