diff options
author | Sam Potts <me@sampotts.me> | 2017-03-25 10:09:14 +1100 |
---|---|---|
committer | Sam Potts <me@sampotts.me> | 2017-03-25 10:09:14 +1100 |
commit | 7b6257ff2044efafa1dc7210537f2119700105ce (patch) | |
tree | 290379ec8392a738203eb66530b8ffc936a7b0cd /src | |
parent | 13973125fbc18768400c55b7eece1ac4649b5386 (diff) | |
parent | ddf910434944c671e92c0e934ce568a20cda19cb (diff) | |
download | plyr-7b6257ff2044efafa1dc7210537f2119700105ce.tar.lz plyr-7b6257ff2044efafa1dc7210537f2119700105ce.tar.xz plyr-7b6257ff2044efafa1dc7210537f2119700105ce.zip |
Merge branch 'develop' of https://github.com/Selz/plyr into develop
# Conflicts:
# dist/plyr.js
Diffstat (limited to 'src')
-rw-r--r-- | src/js/plyr.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/js/plyr.js b/src/js/plyr.js index f3d1dc02..53ca0c92 100644 --- a/src/js/plyr.js +++ b/src/js/plyr.js @@ -59,7 +59,7 @@ hideControls: true, showPosterOnEnd: false, disableContextMenu: true, - keyboardShorcuts: { + keyboardShortcuts: { focused: true, global: false }, @@ -3490,11 +3490,11 @@ } // Keyboard shortcuts - if (config.keyboardShorcuts.focused) { + if (config.keyboardShortcuts.focused) { var last = null; // Handle global presses - if (config.keyboardShorcuts.global) { + if (config.keyboardShortcuts.global) { on(window, 'keydown keyup', function(event) { var code = getKeyCode(event), focused = getFocusElement(), |