Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4224 from Rob--W/shortcut-responsiveness

Browse Source 
Focus container when arrow/navigation keys are pressed
This commit is contained in:
Brendan Dahl 2014-02-26 10:52:17 -08:00
commit 890752680b
1 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
web/viewer.js
View File

@ -2156,25 +2156,15 @@ window.addEventListener('keydown', function keydown(evt) {
// Some shortcuts should not get handled if a control/input element // Some shortcuts should not get handled if a control/input element
// is selected. // is selected.
var curElement = document.activeElement || document.querySelector(':focus'); var curElement = document.activeElement || document.querySelector(':focus');
if (curElement && (curElement.tagName.toUpperCase() === 'INPUT' || var curElementTagName = curElement && curElement.tagName.toUpperCase();
curElement.tagName.toUpperCase() === 'TEXTAREA' || if (curElementTagName === 'INPUT' ||
curElement.tagName.toUpperCase() === 'SELECT')) { curElementTagName === 'TEXTAREA' ||
curElementTagName === 'SELECT') {
// Make sure that the secondary toolbar is closed when Escape is pressed. // Make sure that the secondary toolbar is closed when Escape is pressed.
if (evt.keyCode !== 27) { // 'Esc' if (evt.keyCode !== 27) { // 'Esc'
return; return;
} }
} }
var controlsElement = document.getElementById('toolbar');
while (curElement) {
if (curElement === controlsElement && !PresentationMode.active)
return; // ignoring if the 'toolbar' element is focused
curElement = curElement.parentNode;
}
//#if (FIREFOX || MOZCENTRAL)
//// Workaround for issue in Firefox, that prevents scroll keys from working
//// when elements with 'tabindex' are focused.
//PDFView.container.blur();
//#endif
if (cmd === 0) { // no control key pressed at all. if (cmd === 0) { // no control key pressed at all.
switch (evt.keyCode) { switch (evt.keyCode) {
@ -2250,6 +2240,29 @@ window.addEventListener('keydown', function keydown(evt) {
PDFView.rotatePages(90); PDFView.rotatePages(90);
break; break;
} }
if (!handled && !PresentationMode.active) {
// 33=Page Up 34=Page Down 35=End 36=Home
// 37=Left 38=Up 39=Right 40=Down
if (evt.keyCode >= 33 && evt.keyCode <= 40 &&
!PDFView.container.contains(curElement)) {
// The page container is not focused, but a page navigation key has been
// pressed. Change the focus to the viewer container to make sure that
// navigation by keyboard works as expected.
PDFView.container.focus();
}
// 32=Spacebar
if (evt.keyCode === 32 && curElementTagName !== 'BUTTON') {
//#if !(FIREFOX || MOZCENTRAL)
//// Workaround for issue in Firefox, that prevents scroll keys from working
//// when elements with 'tabindex' are focused. (#3499)
// PDFView.container.blur();
//#else
if (!PDFView.container.contains(curElement)) {
PDFView.container.focus();
}
//#endif
}
}
} }
if (cmd === 4) { // shift-key if (cmd === 4) { // shift-key