summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorctrlaltca@gmail.com <>2012-04-14 13:18:59 +0000
committerctrlaltca@gmail.com <>2012-04-14 13:18:59 +0000
commitec32aa3e046b236c8a0f5aa5ea74d68bb120a6da (patch)
tree6113fdcb7ca7ddcd8a299d343310ef572184906a
parent4bb1e22981b24cb3ab1c4f9b17937f1b58336af5 (diff)
When rendering the <span> used as a placeholder for an invisible activecontrol, set its style to display:none to ensure it's considered not-visible by clientside javascript
-rw-r--r--framework/Web/UI/ActiveControls/TActiveControlAdapter.php4
-rw-r--r--tests/FunctionalTests/tickets/protected/pages/Ticket504.php2
-rw-r--r--tests/FunctionalTests/tickets/protected/pages/Ticket521.page4
3 files changed, 2 insertions, 8 deletions
diff --git a/framework/Web/UI/ActiveControls/TActiveControlAdapter.php b/framework/Web/UI/ActiveControls/TActiveControlAdapter.php
index fe8b0757..3e6747b3 100644
--- a/framework/Web/UI/ActiveControls/TActiveControlAdapter.php
+++ b/framework/Web/UI/ActiveControls/TActiveControlAdapter.php
@@ -94,7 +94,7 @@ class TActiveControlAdapter extends TControlAdapter
{
parent::render($writer);
} else {
- $writer->write("<span id=\"".$this->_control->getClientID()."\" ></span>");
+ $writer->write("<span id=\"".$this->_control->getClientID()."\" style=\"display:none\"></span>");
}
}
@@ -346,7 +346,7 @@ class TCallbackPageStateTracker
protected function updateVisible($visible)
{
if($visible === false)
- $this->client()->replaceContent($this->_control,"<span id=\"".$this->_control->getClientID()."\" ></span>");
+ $this->client()->replaceContent($this->_control,"<span id=\"".$this->_control->getClientID()."\" style=\"display:none\" ></span>");
else
$this->client()->replaceContent($this->_control,$this->_control);
}
diff --git a/tests/FunctionalTests/tickets/protected/pages/Ticket504.php b/tests/FunctionalTests/tickets/protected/pages/Ticket504.php
index f61bfec3..7ad8e989 100644
--- a/tests/FunctionalTests/tickets/protected/pages/Ticket504.php
+++ b/tests/FunctionalTests/tickets/protected/pages/Ticket504.php
@@ -8,8 +8,6 @@ class Ticket504 extends TPage
private function showPanel($id, $param) {
foreach($this->panels as $panel) {
if($id == $panel) {
- $this->$panel->setAttribute('style', 'display: block;');
- $this->$panel->render($param->NewWriter);
$this->$panel->setVisible(true);
} else {
$this->$panel->setVisible(false);
diff --git a/tests/FunctionalTests/tickets/protected/pages/Ticket521.page b/tests/FunctionalTests/tickets/protected/pages/Ticket521.page
index e1f65663..f3014020 100644
--- a/tests/FunctionalTests/tickets/protected/pages/Ticket521.page
+++ b/tests/FunctionalTests/tickets/protected/pages/Ticket521.page
@@ -1,9 +1,5 @@
<com:TContent ID="Content">
-<!--
- <com:System.Web.UI.ActiveControls.TActiveButton ID="addInvestType" Text="Add"
- OnCallback="doSave" />
--->
<com:System.Web.UI.ActiveControls.TActiveButton id="button1" OnClick="doOnClick" OnCallback="doSave" Text="Save" />
<com:System.Web.UI.ActiveControls.TActiveLabel ID="label1" Text="Label 1" />