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

fix #2489; use new focus controller method

Browse source
This commit is contained in:
rlx 2014-09-23 21:04:40 +02:00
parent 06c21e0a46
commit 2a6ea64eed
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -186,7 +186,9 @@ Ox.VideoPlayer = function(options, self) {
self.options.fullscreen = !self.options.fullscreen; self.options.fullscreen = !self.options.fullscreen;
toggleFullscreen(); toggleFullscreen();
}, },
height: setSizes, height: function() {
setSizes();
},
'in': function() { 'in': function() {
self.options.paused && setMarkers(); self.options.paused && setMarkers();
self.$timeline && self.$timeline.options('in', self.options['in']); self.$timeline && self.$timeline.options('in', self.options['in']);
@ -234,7 +236,9 @@ Ox.VideoPlayer = function(options, self) {
volume: function() { volume: function() {
setVolume(self.options.volume); setVolume(self.options.volume);
}, },
width: setSizes width: function() {
setSizes();
}
}) })
.addClass('OxVideoPlayer'); .addClass('OxVideoPlayer');
@ -362,11 +366,7 @@ Ox.VideoPlayer = function(options, self) {
} else { } else {
that.on({ that.on({
click: function() { click: function() {
var focused = Ox.Focus.focused(); if (!Ox.Focus.focusedElementIsInput()) {
if (
!focused
|| !Ox.UI.elements[focused].is('.OxInput')
) {
that.gainFocus(); that.gainFocus();
} }
} }