Fix keyboard mapping in viewer

This commit is contained in:
Julian Viereck 2012-04-10 09:55:52 -07:00
parent d8235925ac
commit caa3c3fdc4

View File

@ -1456,8 +1456,6 @@ window.addEventListener('pagechange', function pagechange(evt) {
}, true); }, true);
window.addEventListener('keydown', function keydown(evt) { window.addEventListener('keydown', function keydown(evt) {
if (evt.ctrlKey || evt.altKey || evt.shiftKey || evt.metaKey)
return;
var curElement = document.activeElement; var curElement = document.activeElement;
if (curElement && curElement.tagName == 'INPUT') if (curElement && curElement.tagName == 'INPUT')
return; return;
@ -1467,7 +1465,31 @@ window.addEventListener('keydown', function keydown(evt) {
return; // ignoring if the 'controls' element is focused return; // ignoring if the 'controls' element is focused
curElement = curElement.parentNode; curElement = curElement.parentNode;
} }
var cmd = 0;
if (evt.ctrlKey) cmd |= 1;
if (evt.altKey) cmd |= 2;
if (evt.shiftKey) cmd |= 4;
if (evt.metaKey) cmd |= 8;
var handled = false; var handled = false;
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;
}
}
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 '='
@ -1484,18 +1506,7 @@ window.addEventListener('keydown', function keydown(evt) {
PDFView.parseScale(kDefaultScale, true); PDFView.parseScale(kDefaultScale, true);
handled = true; handled = true;
break; break;
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) {