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

correct docs, add comments

Browse source
This commit is contained in:
rolux 2013-12-07 13:03:34 +01:00
parent 37ab78f05b
commit 6dbdf91259
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/Ox.UI/js/Core/Keyboard.js
View file

@ -31,6 +31,7 @@ Ox.Keyboard = (function() {
} }
}); });
key = keyNames.join('_'); key = keyNames.join('_');
// If no input element has focus, invoke global handlers
if ( if (
focused === null || ( focused === null || (
!$focused.hasClass('OxInput') !$focused.hasClass('OxInput')
@ -50,6 +51,7 @@ Ox.Keyboard = (function() {
event.preventDefault(); event.preventDefault();
} }
} }
// If the focused element is not bound globally, invoke element handlers
if (focused !== null && bound.indexOf(focused) == -1) { if (focused !== null && bound.indexOf(focused) == -1) {
$focused.triggerEvent('key_' + key); $focused.triggerEvent('key_' + key);
// prevent Chrome from scrolling, or going back in history // prevent Chrome from scrolling, or going back in history

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

@ -32,7 +32,7 @@ Ox.VideoPlayer <f> Generic Video Player
externalControls <b|false> If true, controls are outside the video externalControls <b|false> If true, controls are outside the video
enableTimeline <b|false> If true, show timeline enableTimeline <b|false> If true, show timeline
find <s|''> Query string find <s|''> Query string
focus <s|'click'> focus on 'click', 'load' or 'mouseover' focus <s|'click'> focus on 'click', 'load' or 'mouseenter'
format <s|''> video format (like 'webm') format <s|''> video format (like 'webm')
fps <n|25> Frames per second fps <n|25> Frames per second
fullscreen <b|false> If true, video is in fullscreen fullscreen <b|false> If true, video is in fullscreen