summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormikl <>2008-04-18 17:39:20 +0000
committermikl <>2008-04-18 17:39:20 +0000
commit60a4991e9bd37457cafc6f3a19fd83f8c71ef3b0 (patch)
treee4fa73fa5ccf7170e04baf54be9b3fabffb82537
parentaf0bef8c905a277392463e795a168cc2d05b8af3 (diff)
Fix #695
-rw-r--r--HISTORY1
-rw-r--r--framework/Web/Javascripts/source/prado/activecontrols/activecontrols3.js3
-rw-r--r--tests/FunctionalTests/tickets/protected/pages/Ticket695.page1
3 files changed, 4 insertions, 1 deletions
diff --git a/HISTORY b/HISTORY
index 6343bc7b..25f5cf87 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6,6 +6,7 @@ BUG: Ticket#636 - I18N catalogue problem (Christophe)
BUG: Ticket#669 - Strange rendering behaviour with TActivePanel (Christophe)
BUG: Ticket#671 - TActiveCustomValidator Callback Problem (Christophe)
BUG: Ticket#679 - TActiveLabel can't be shown from inside TRepeater. TActiveRadioButton cant be unchecked (Christophe)
+BUG: Ticket#695 - ActiveTextBox filled in IE blocks other elements (Michael)
BUG: Ticket#707 - TPropertyAccess sets property twice on object when using setters (Qiang)
BUG: Ticket#719 - TAutoCompleter should not trigger Validation if CausesValidation=False (Christophe)
BUG: Ticket#721 - TActiveCustomValidator + TValidationSummary problem (Christophe)
diff --git a/framework/Web/Javascripts/source/prado/activecontrols/activecontrols3.js b/framework/Web/Javascripts/source/prado/activecontrols/activecontrols3.js
index 28bd3fa9..7ee4c0e6 100644
--- a/framework/Web/Javascripts/source/prado/activecontrols/activecontrols3.js
+++ b/framework/Web/Javascripts/source/prado/activecontrols/activecontrols3.js
@@ -85,7 +85,8 @@ Prado.WebUI.TActiveTextBox = Class.extend(Prado.WebUI.TTextBox,
{
var request = new Prado.CallbackRequest(options.EventTarget, options);
request.dispatch();
- Event.stop(event);
+ if (!Prototype.Browser.IE)
+ Event.stop(event);
}
});
diff --git a/tests/FunctionalTests/tickets/protected/pages/Ticket695.page b/tests/FunctionalTests/tickets/protected/pages/Ticket695.page
index 884be053..00add0af 100644
--- a/tests/FunctionalTests/tickets/protected/pages/Ticket695.page
+++ b/tests/FunctionalTests/tickets/protected/pages/Ticket695.page
@@ -1,6 +1,7 @@
<com:TContent ID="Content">
<com:TActiveTextBox ID="ATB" AutoPostBack="True" onTextChanged="onATB" /><br />
+<com:TActiveCheckBox ID="ACB" AutoPostBack="True" /><br />
<com:TTextBox ID="TB"/><br />
Callbacks: <com:TActiveLabel ID="X" Text="0"/>