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

Really fix the keyboard handling

Browse Source
This commit is contained in:
Julian Viereck 2012-04-11 15:47:11 -07:00
parent caa3c3fdc4
commit e8b18ef167
1 changed files with 38 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
web/viewer.js
View File

@ -1456,16 +1456,6 @@ window.addEventListener('pagechange', function pagechange(evt) {
}, true); }, true);
window.addEventListener('keydown', function keydown(evt) { window.addEventListener('keydown', function keydown(evt) {
var curElement = document.activeElement;
if (curElement && curElement.tagName == 'INPUT')
return;
var controlsElement = document.getElementById('controls');
while (curElement) {
if (curElement === controlsElement)
return; // ignoring if the 'controls' element is focused
curElement = curElement.parentNode;
}
var cmd = 0; var cmd = 0;
if (evt.ctrlKey) cmd |= 1; if (evt.ctrlKey) cmd |= 1;
if (evt.altKey) cmd |= 2; if (evt.altKey) cmd |= 2;
@ -1473,23 +1463,10 @@ window.addEventListener('keydown', function keydown(evt) {
if (evt.metaKey) cmd |= 8; if (evt.metaKey) cmd |= 8;
var handled = false; var handled = false;
if (cmd == 0) { // no control key pressed at all.
switch (evt.keyCode) { // First, handle the key bindings that are independent whether an input
case 37: // left arrow // control is selected or not.
case 75: // 'k' if (cmd == 1 || cmd == 8) { // either CTRL or META key.
case 80: // 'p'
PDFView.page--;
handled = true;
break;
case 39: // right arrow
case 74: // 'j'
case 78: // 'n'
PDFView.page++;
handled = true;
break;
}
}
else if (cmd == 1 || cmd == 8) { // either CTRL or META key.
switch (evt.keyCode) { switch (evt.keyCode) {
case 61: // FF/Mac '=' case 61: // FF/Mac '='
case 107: // FF '+' and '=' case 107: // FF '+' and '='
@ -1509,6 +1486,40 @@ window.addEventListener('keydown', function keydown(evt) {
} }
} }
if (handled) {
evt.preventDefault();
return;
}
// Some shortcuts should not get handled if a control/input element
// is selected.
var curElement = document.activeElement;
if (curElement && curElement.tagName == 'INPUT')
return;
var controlsElement = document.getElementById('controls');
while (curElement) {
if (curElement === controlsElement)
return; // ignoring if the 'controls' element is focused
curElement = curElement.parentNode;
}
if (cmd == 0) { // no control key pressed at all.
switch (evt.keyCode) {
case 37: // left arrow
case 75: // 'k'
case 80: // 'p'
PDFView.page--;
handled = true;
break;
case 39: // right arrow
case 74: // 'j'
case 78: // 'n'
PDFView.page++;
handled = true;
break;
}
}
if (handled) { if (handled) {
evt.preventDefault(); evt.preventDefault();
} }