diff options
| author | ctrlaltca@gmail.com <> | 2011-12-21 13:14:26 +0000 |
|---|---|---|
| committer | ctrlaltca@gmail.com <> | 2011-12-21 13:14:26 +0000 |
| commit | 9409f9ee7d83635d262d303edee9136dd6170e14 (patch) | |
| tree | 2b43e3ac49c180bda497cfd49a36b912d8e2b9a2 | |
| parent | b26680c80e112cc91755fea84426f2d57beb4232 (diff) | |
fixed #66
| -rw-r--r-- | HISTORY | 1 | ||||
| -rw-r--r-- | framework/Web/Javascripts/source/prado/controls/controls.js | 4 |
2 files changed, 4 insertions, 1 deletions
@@ -20,6 +20,7 @@ BUG: TActiveFileUpload: urlencode the base64'ed token since it can contain the " BUG: TCaptcha: publish images with image/png content-type (ctrlaltca) BUG: Issue #35 - [840] Capital letters for the initial letter of the directories name (ctrlaltca) +BUG: Issue #66 - TButton.CausesValidation=False ignored when pressing Enter on the button within a control with DefaultButton (ctrlaltca) NEW: Issue #83 - PHP configuration style (Carl) ENH: Issue #106 - TJavaScript::jsonEncode and TJavaScript::jsonDecode should use built-in PHP functions (ctrlaltca) ENH: Issue #173 - Add "dragdropextra" (supergsting) patch, mouse coordinates and key status to drag & drop controls (Christophe, DevWorx) 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)
|