Check form.onsubmit in ajaxForm

This commit is contained in:
Jakub Vrana 2011-06-13 16:23:51 +02:00
parent 98a00bacc5
commit 9c370ad504

View file

@ -199,14 +199,14 @@ function bodyKeydown(event, button) {
var target = event.target || event.srcElement; var target = event.target || event.srcElement;
if (event.ctrlKey && (event.keyCode == 13 || event.keyCode == 10) && !event.altKey && !event.metaKey && /select|textarea|input/i.test(target.tagName)) { // 13|10 - Enter, shiftKey allowed if (event.ctrlKey && (event.keyCode == 13 || event.keyCode == 10) && !event.altKey && !event.metaKey && /select|textarea|input/i.test(target.tagName)) { // 13|10 - Enter, shiftKey allowed
target.blur(); target.blur();
if ((!target.form.onsubmit || target.form.onsubmit() !== false) && !ajaxForm(target.form, (button ? button + '=1' : ''))) { if (ajaxForm(target.form, (button ? button + '=1' : ''))) {
if (button) { return false;
target.form[button].click(); }
} else { if (button) {
target.form.submit(); target.form[button].click();
} } else {
target.form.submit();
} }
return false;
} }
} }
@ -387,7 +387,7 @@ onpopstate = function (event) {
* @return XMLHttpRequest or false in case of an error * @return XMLHttpRequest or false in case of an error
*/ */
function ajaxForm(form, data, noscroll) { function ajaxForm(form, data, noscroll) {
if (/&(database|scheme|create|view|sql|user|dump|call)=/.test(location.href) && !/\./.test(data)) { // . - type="image" if ((/&(database|scheme|create|view|sql|user|dump|call)=/.test(location.href) && !/\./.test(data)) || (form.onsubmit && form.onsubmit() === false)) { // . - type="image"
return false; return false;
} }
var params = [ ]; var params = [ ];