Merge pull request #3487 from timvandermeij/remove-code-duplication

Removing code duplication
This commit is contained in:
Yury Delendik 2013-07-18 06:00:03 -07:00
commit 333a728cb1

View File

@ -2973,12 +2973,18 @@ window.addEventListener('keydown', function keydown(evt) {
if (cmd === 1 || cmd === 8 || cmd === 5 || cmd === 12) { if (cmd === 1 || cmd === 8 || cmd === 5 || cmd === 12) {
// either CTRL or META key with optional SHIFT. // either CTRL or META key with optional SHIFT.
switch (evt.keyCode) { switch (evt.keyCode) {
case 70: case 70: // f
if (!PDFView.supportsIntegratedFind) { if (!PDFView.supportsIntegratedFind) {
PDFFindBar.toggle(); PDFFindBar.toggle();
handled = true; handled = true;
} }
break; break;
case 71: // g
if (!PDFView.supportsIntegratedFind) {
PDFFindBar.dispatchEvent('again', cmd === 5 || cmd === 12);
handled = true;
}
break;
case 61: // FF/Mac '=' case 61: // FF/Mac '='
case 107: // FF '+' and '=' case 107: // FF '+' and '='
case 187: // Chrome '+' case 187: // Chrome '+'
@ -3000,18 +3006,6 @@ window.addEventListener('keydown', function keydown(evt) {
} }
} }
// CTRL or META with or without SHIFT.
if (cmd == 1 || cmd == 8 || cmd == 5 || cmd == 12) {
switch (evt.keyCode) {
case 71: // g
if (!PDFView.supportsIntegratedFind) {
PDFFindBar.dispatchEvent('again', cmd == 5 || cmd == 12);
handled = true;
}
break;
}
}
if (handled) { if (handled) {
evt.preventDefault(); evt.preventDefault();
return; return;