Merge branch '4.0'

This commit is contained in:
Dan Stillman 2016-06-13 23:02:22 -04:00
commit 099b45438d

View file

@ -1056,6 +1056,12 @@ var Zotero_QuickFormat = new function () {
* Handle return or escape * Handle return or escape
*/ */
function _onQuickSearchKeyPress(event) { function _onQuickSearchKeyPress(event) {
// Prevent hang if another key is pressed after Enter
// https://forums.zotero.org/discussion/59157/
if (accepted) {
event.preventDefault();
return;
}
if(qfGuidance) qfGuidance.hide(); if(qfGuidance) qfGuidance.hide();
var keyCode = event.keyCode; var keyCode = event.keyCode;