From d9fc469530dd70be8dfdf337a525437774629ede Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Tue, 17 Sep 2013 23:47:50 +0200 Subject: Avoid triggering the default button of the form when pressing enter over a valid ; fixes #480 --- HISTORY | 2 ++ framework/Web/Javascripts/source/prado/controls/controls.js | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/HISTORY b/HISTORY index 66526085..286a7224 100644 --- a/HISTORY +++ b/HISTORY @@ -8,6 +8,8 @@ BUG: Issue #465 - Textmate editor plugin template error (ctrlaltca) BUG: Issue #472 - No https support from wsdl generator (Marcin Piotrowski) ENH: Issue #473 - wsdl support for additional attributes of a custom type's property (Marcin Piotrowski) BUG: Issue #476 - Demo's don't work out of box (ctrlaltca) +BUG: Issue #479 - TUrlMapping instanciates patterns twice (ctrlaltca) +BUG: Issue #480 - THyperLink is not usable using keyboard navigation (david otto) BUG: Issue #481 - Typo in composer: ext-eaccellerator (ciromattia) BUG: Issue #482 - composer: add include path for prado.php (ciromattia) BUG: Issue #484 - Wrong DateTimePatterns for italian culture (ciromattia) diff --git a/framework/Web/Javascripts/source/prado/controls/controls.js b/framework/Web/Javascripts/source/prado/controls/controls.js index fd8a4c91..8ea6afe3 100644 --- a/framework/Web/Javascripts/source/prado/controls/controls.js +++ b/framework/Web/Javascripts/source/prado/controls/controls.js @@ -419,9 +419,10 @@ Prado.WebUI.DefaultButton = Class.create(Prado.WebUI.Control, { var enterPressed = Event.keyCode(ev) == Event.KEY_RETURN; var isTextArea = Event.element(ev).tagName.toLowerCase() == "textarea"; + var isHyperLink = Event.element(ev).tagName.toLowerCase() == "a" && Event.element(ev).hasAttribute("href"); var isValidButton = Event.element(ev).tagName.toLowerCase() == "input" && Event.element(ev).type.toLowerCase() == "submit"; - if(enterPressed && !isTextArea && !isValidButton) + if(enterPressed && !isTextArea && !isValidButton && !isHyperLink) { var defaultButton = $(this.options['Target']); if(defaultButton) -- cgit v1.2.3