ProximaEntertainment/plyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/Selz/plyr into develop

Browse Source 
# Conflicts:
#	dist/plyr.js
This commit is contained in:
Sam Potts 2017-03-25 10:09:14 +11:00
commit 7b6257ff20
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dist/plyr.js vendored
View File

File diff suppressed because one or more lines are too long

6
src/js/plyr.js
View File

@ -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(),