From 2a6ea64eed3e597db59ef5f6ea730c6f11283327 Mon Sep 17 00:00:00 2001 From: rlx <0x0073@0x2620.org> Date: Tue, 23 Sep 2014 21:04:40 +0200 Subject: [PATCH] fix #2489; use new focus controller method --- source/Ox.UI/js/Video/VideoPlayer.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/source/Ox.UI/js/Video/VideoPlayer.js b/source/Ox.UI/js/Video/VideoPlayer.js index 5a9f8f84..0080dbd2 100644 --- a/source/Ox.UI/js/Video/VideoPlayer.js +++ b/source/Ox.UI/js/Video/VideoPlayer.js @@ -186,7 +186,9 @@ Ox.VideoPlayer = function(options, self) { self.options.fullscreen = !self.options.fullscreen; toggleFullscreen(); }, - height: setSizes, + height: function() { + setSizes(); + }, 'in': function() { self.options.paused && setMarkers(); self.$timeline && self.$timeline.options('in', self.options['in']); @@ -234,7 +236,9 @@ Ox.VideoPlayer = function(options, self) { volume: function() { setVolume(self.options.volume); }, - width: setSizes + width: function() { + setSizes(); + } }) .addClass('OxVideoPlayer'); @@ -362,11 +366,7 @@ Ox.VideoPlayer = function(options, self) { } else { that.on({ click: function() { - var focused = Ox.Focus.focused(); - if ( - !focused - || !Ox.UI.elements[focused].is('.OxInput') - ) { + if (!Ox.Focus.focusedElementIsInput()) { that.gainFocus(); } }