Merge branch 'develop' of https://github.com/lrsjng/h5ai into develop

This commit is contained in:
Tom van der Woerdt 2013-07-17 19:12:39 +02:00
commit 84208f7b34
2 changed files with 14 additions and 6 deletions

View File

@ -178,17 +178,22 @@ modulejs.define('ext/preview-img', ['_', '$', 'core/settings', 'core/resource',
var key = event.which;
if (key === 27) { // esc
event.preventDefault();
event.stopImmediatePropagation();
onExit();
} else if (key === 8 || key === 37 || key === 40) { // backspace, left, down
event.preventDefault();
event.stopImmediatePropagation();
onPrevious();
} else if (key === 13 || key === 32 || key === 38 || key === 39) { // enter, space, up, right
event.preventDefault();
event.stopImmediatePropagation();
onNext();
} else if (key === 70) { // f
event.preventDefault();
event.stopImmediatePropagation();
onFullscreen();
}
event.preventDefault();
event.stopImmediatePropagation();
},
initItem = function (item) {

View File

@ -248,15 +248,18 @@ modulejs.define('ext/preview-txt', ['_', '$', 'core/settings', 'core/resource',
var key = event.which;
if (key === 27) { // esc
event.preventDefault();
event.stopImmediatePropagation();
onExit();
} else if (key === 8 || key === 37 || key === 40) { // backspace, left, down
event.preventDefault();
event.stopImmediatePropagation();
onPrevious();
} else if (key === 13 || key === 32 || key === 38 || key === 39) { // enter, space, up, right
event.preventDefault();
event.stopImmediatePropagation();
onNext();
}
event.preventDefault();
event.stopImmediatePropagation();
},
initItem = function (item) {