diff --git a/source/Ox.UI/js/Core/Keyboard.js b/source/Ox.UI/js/Core/Keyboard.js index 19994215..3035b590 100644 --- a/source/Ox.UI/js/Core/Keyboard.js +++ b/source/Ox.UI/js/Core/Keyboard.js @@ -31,6 +31,7 @@ Ox.Keyboard = (function() { } }); key = keyNames.join('_'); + // If no input element has focus, invoke global handlers if ( focused === null || ( !$focused.hasClass('OxInput') @@ -50,6 +51,7 @@ Ox.Keyboard = (function() { event.preventDefault(); } } + // If the focused element is not bound globally, invoke element handlers if (focused !== null && bound.indexOf(focused) == -1) { $focused.triggerEvent('key_' + key); // prevent Chrome from scrolling, or going back in history diff --git a/source/Ox.UI/js/Video/VideoPlayer.js b/source/Ox.UI/js/Video/VideoPlayer.js index 2b16664e..18e87f45 100644 --- a/source/Ox.UI/js/Video/VideoPlayer.js +++ b/source/Ox.UI/js/Video/VideoPlayer.js @@ -32,7 +32,7 @@ Ox.VideoPlayer Generic Video Player externalControls If true, controls are outside the video enableTimeline If true, show timeline find Query string - focus focus on 'click', 'load' or 'mouseover' + focus focus on 'click', 'load' or 'mouseenter' format video format (like 'webm') fps Frames per second fullscreen If true, video is in fullscreen