From d2e6d38dd71101e67457e8f78c1232c3e0294c27 Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Sat, 23 Aug 2014 16:30:16 +0200 Subject: Revert "Optimization: avoid duplicate creation of T*CheckBoxList, T*RadioButtonList js items" This reverts commit 606728e5c2fb1dfe2ca2760b9894f5c6d378d9b5. --- framework/Web/UI/ActiveControls/TActiveCheckBoxList.php | 17 +---------------- .../Web/UI/ActiveControls/TActiveRadioButtonList.php | 17 +---------------- 2 files changed, 2 insertions(+), 32 deletions(-) (limited to 'framework/Web/UI/ActiveControls') 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); - } -} -- cgit v1.2.3