From d05fc3c1b8c178a322d66ad00ae877df487be3f5 Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Sat, 30 Oct 2010 13:32:54 +0000 Subject: [PATCH] Validation code was skipped by esc/ctrlenter hotkeys. --- js/inserts.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/js/inserts.js b/js/inserts.js index b9564ed9..a1e1e5ea 100644 --- a/js/inserts.js +++ b/js/inserts.js @@ -427,11 +427,13 @@ function setHotKeys() { return false; } if (((asp && asp.indexOf('default') !== -1) && key==13)||((asp && asp.indexOf('cancel') !== -1) && key==27)) { - - if (asp.indexOf('process') !== -1) - JsHttpRequest.request(el, null, 60000); - else - JsHttpRequest.request(el); + var func = _validate[el.name]; + if (func==undefined || func()) { + if (asp.indexOf('process') !== -1) + JsHttpRequest.request(el, null, 60000); + else + JsHttpRequest.request(el); + } ev.returnValue = false; return false; } -- 2.30.2