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

video player with external controls: fix css and fullscreen

Browse source
This commit is contained in:
rlx 2013-07-14 19:52:18 +00:00
parent 8806961465
commit d9dfa9f0c6
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/Ox.UI/css/theme.css
View file

@ -1037,8 +1037,8 @@ Video
border-color: $videoTimelineMarkerShadow; border-color: $videoTimelineMarkerShadow;
} }
.$themeClass .OxVideoPlayer .OxControls, .$themeClass .OxVideoPlayer .OxControls.OxOnScreen,
.$themeClass .OxVideoPlayer .OxControls .OxFind { .$themeClass .OxVideoPlayer .OxControls.OxOnScreen .OxFind {
background-image: -moz-linear-gradient(top, $videoBarGradient); background-image: -moz-linear-gradient(top, $videoBarGradient);
background-image: -o-linear-gradient(top, $videoBarGradient); background-image: -o-linear-gradient(top, $videoBarGradient);
background-image: -webkit-linear-gradient(top, $videoBarGradient); background-image: -webkit-linear-gradient(top, $videoBarGradient);

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

@ -2449,6 +2449,11 @@ Ox.VideoPlayer = function(options, self) {
zIndex: 1000 zIndex: 1000
}) })
.appendTo(Ox.UI.$body); .appendTo(Ox.UI.$body);
if (self.options.externalControls) {
self.externalControls = true;
self.options.externalControls = false;
self.$videoContainer.css({top: 0});
}
setSizes(true, function() { setSizes(true, function() {
playOnFullscreen && self.$video.play(); playOnFullscreen && self.$video.play();
enterFullscreen(); enterFullscreen();
@ -2461,6 +2466,10 @@ Ox.VideoPlayer = function(options, self) {
.trigger('mouseleave') .trigger('mouseleave')
.off('mouseenter mouseleave'); .off('mouseenter mouseleave');
clearTimeout(self.interfaceTimeout); clearTimeout(self.interfaceTimeout);
if (self.externalControls) {
self.options.externalControls = true;
self.$videoContainer.css({top: '16px'});
}
setSizes(true, function() { setSizes(true, function() {
self.exitFullscreen = false; self.exitFullscreen = false;
that.detach() that.detach()