From 9409f9ee7d83635d262d303edee9136dd6170e14 Mon Sep 17 00:00:00 2001
From: "ctrlaltca@gmail.com" <>
Date: Wed, 21 Dec 2011 13:14:26 +0000
Subject: fixed #66

---
 framework/Web/Javascripts/source/prado/controls/controls.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'framework')

diff --git a/framework/Web/Javascripts/source/prado/controls/controls.js b/framework/Web/Javascripts/source/prado/controls/controls.js
index 43dd889e..9dadff18 100644
--- a/framework/Web/Javascripts/source/prado/controls/controls.js
+++ b/framework/Web/Javascripts/source/prado/controls/controls.js
@@ -210,7 +210,9 @@ Prado.WebUI.DefaultButton.prototype =
 	{
 		var enterPressed = Event.keyCode(ev) == Event.KEY_RETURN;
 		var isTextArea = Event.element(ev).tagName.toLowerCase() == "textarea";
-		if(enterPressed && !isTextArea)
+		var isValidButton = Event.element(ev).tagName.toLowerCase() == "input" &&  Event.element(ev).type.toLowerCase() == "submit";
+		
+		if(enterPressed && !isTextArea && !isValidButton)
 		{
 			var defaultButton = $(this.options['Target']);
 			if(defaultButton)
-- 
cgit v1.2.3