summaryrefslogtreecommitdiff
path: root/framework/Web
diff options
context:
space:
mode:
authorFabio Bas <ctrlaltca@gmail.com>2014-08-23 16:30:16 +0200
committerFabio Bas <ctrlaltca@gmail.com>2014-08-23 16:30:16 +0200
commitd2e6d38dd71101e67457e8f78c1232c3e0294c27 (patch)
tree652b26f8deffe8a2e1de8ae5203b8e8ec54be942 /framework/Web
parent57987c93c15da02d6e39ab238f0abc40fe11dc4a (diff)
Revert "Optimization: avoid duplicate creation of T*CheckBoxList, T*RadioButtonList js items"
This reverts commit 606728e5c2fb1dfe2ca2760b9894f5c6d378d9b5.
Diffstat (limited to 'framework/Web')
-rw-r--r--framework/Web/UI/ActiveControls/TActiveCheckBoxList.php17
-rw-r--r--framework/Web/UI/ActiveControls/TActiveRadioButtonList.php17
-rw-r--r--framework/Web/UI/WebControls/TCheckBoxList.php10
-rw-r--r--framework/Web/UI/WebControls/TRadioButtonList.php10
4 files changed, 4 insertions, 50 deletions
diff --git a/framework/Web/UI/ActiveControls/TActiveCheckBoxList.php b/framework/Web/UI/ActiveControls/TActiveCheckBoxList.php
index 9280f0e8..aa2d5f94 100644
--- a/framework/Web/UI/ActiveControls/TActiveCheckBoxList.php
+++ b/framework/Web/UI/ActiveControls/TActiveCheckBoxList.php
@@ -76,7 +76,7 @@ class TActiveCheckBoxList extends TCheckBoxList implements IActiveControl, ICall
*/
protected function createRepeatedControl()
{
- $control = new TActiveCheckBoxListItem;
+ $control = new TActiveCheckBox;
$control->getAdapter()->setBaseActiveControl($this->getActiveControl());
return $control;
}
@@ -117,18 +117,3 @@ class TActiveCheckBoxList extends TCheckBoxList implements IActiveControl, ICall
}
-class TActiveCheckBoxListItem extends TActiveCheckBox
-{
- /**
- * Override client implementation to avoid emitting the javascript
- *
- * @param THtmlWriter the writer for the rendering purpose
- * @param string checkbox id
- * @param string onclick js
- */
- protected function renderInputTag($writer,$clientID,$onclick)
- {
- TCheckBox::renderInputTag($writer,$clientID,$onclick);
- }
-}
-
diff --git a/framework/Web/UI/ActiveControls/TActiveRadioButtonList.php b/framework/Web/UI/ActiveControls/TActiveRadioButtonList.php
index 503841a3..5c76aed1 100644
--- a/framework/Web/UI/ActiveControls/TActiveRadioButtonList.php
+++ b/framework/Web/UI/ActiveControls/TActiveRadioButtonList.php
@@ -77,7 +77,7 @@ class TActiveRadioButtonList extends TRadioButtonList implements IActiveControl,
*/
protected function createRepeatedControl()
{
- $control = new TActiveRadioButtonItem;
+ $control = new TActiveRadioButton;
$control->getAdapter()->setBaseActiveControl($this->getActiveControl());
return $control;
}
@@ -117,18 +117,3 @@ class TActiveRadioButtonList extends TRadioButtonList implements IActiveControl,
}
}
-
-class TActiveRadioButtonItem extends TActiveRadioButton
-{
- /**
- * Override client implementation to avoid emitting the javascript
- *
- * @param THtmlWriter the writer for the rendering purpose
- * @param string checkbox id
- * @param string onclick js
- */
- protected function renderInputTag($writer,$clientID,$onclick)
- {
- TRadioButton::renderInputTag($writer,$clientID,$onclick);
- }
-}
diff --git a/framework/Web/UI/WebControls/TCheckBoxList.php b/framework/Web/UI/WebControls/TCheckBoxList.php
index 94278764..af59545c 100644
--- a/framework/Web/UI/WebControls/TCheckBoxList.php
+++ b/framework/Web/UI/WebControls/TCheckBoxList.php
@@ -72,7 +72,7 @@ class TCheckBoxList extends TListControl implements IRepeatInfoUser, INamingCont
*/
protected function createRepeatedControl()
{
- return new TCheckBoxItem;
+ return new TCheckBox;
}
/**
@@ -499,11 +499,3 @@ class TCheckBoxList extends TListControl implements IRepeatInfoUser, INamingCont
}
-class TCheckBoxItem extends TCheckBox {
- /**
- * Override client implementation to avoid emitting the javascript
- */
- protected function renderClientControlScript($writer)
- {
- }
-}
diff --git a/framework/Web/UI/WebControls/TRadioButtonList.php b/framework/Web/UI/WebControls/TRadioButtonList.php
index 3afe3ec2..bead3582 100644
--- a/framework/Web/UI/WebControls/TRadioButtonList.php
+++ b/framework/Web/UI/WebControls/TRadioButtonList.php
@@ -47,7 +47,7 @@ class TRadioButtonList extends TCheckBoxList
*/
protected function createRepeatedControl()
{
- return new TRadioButtonItem;
+ return new TRadioButton;
}
/**
@@ -97,11 +97,3 @@ class TRadioButtonList extends TCheckBoxList
}
}
-class TRadioButtonItem extends TRadioButton {
- /**
- * Override client implementation to avoid emitting the javascript
- */
- protected function renderClientControlScript($writer)
- {
- }
-}