diff --git a/src/assets/netteForms.js b/src/assets/netteForms.js index 4a48ad06a..507dbaf43 100644 --- a/src/assets/netteForms.js +++ b/src/assets/netteForms.js @@ -268,15 +268,28 @@ Nette.addError = function(elem, message) { * Display error messages. */ Nette.showErrors = function(errors) { - if (!errors.length) { - return; - } - var error = errors[0]; - if (error.message) { - alert(error.message); + var messages = [], + focusElem; + + for (var i in errors) { + var elem = errors[i].element, + message = errors[i].message; + + if (messages.indexOf(message) < 0) { + messages.push(message); + + if (!focusElem && elem.focus) { + focusElem = elem; + } + } } - if (error.element.focus) { - error.element.focus(); + + if (messages.length) { + alert(messages.join('\n')); + + if (focusElem) { + focusElem.focus(); + } } };