Optimization: avoid duplicate creation of T*CheckBoxList, T*RadioButtonList js items

2 files changed, 18 insertions, 2 deletions

diff --git a/framework/Web/UI/WebControls/TCheckBoxList.php b/framework/Web/UI/WebControls/TCheckBoxList.php
index 16e6b7f5..029b6c89 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 TCheckBox;
+		return new TCheckBoxItem;
 	}
 
 	/**
@@ -499,3 +499,11 @@ 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 bead3582..3afe3ec2 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 TRadioButton;
+		return new TRadioButtonItem;
 	}
 
 	/**
@@ -97,3 +97,11 @@ class TRadioButtonList extends TCheckBoxList
 	}
 }
 
+class TRadioButtonItem extends TRadioButton {
+	/**
+	 * Override client implementation to avoid emitting the javascript
+	 */
+	protected function renderClientControlScript($writer)
+	{
+	}
+}