diff options
| -rw-r--r-- | demos/controls/protected/pages/HomePage.tpl | 1 | ||||
| -rw-r--r-- | framework/Web/UI/TClientScriptManager.php | 12 | ||||
| -rw-r--r-- | framework/Web/UI/WebControls/TCheckBox.php | 2 |
3 files changed, 8 insertions, 7 deletions
diff --git a/demos/controls/protected/pages/HomePage.tpl b/demos/controls/protected/pages/HomePage.tpl index b9d24e36..bebc2d4f 100644 --- a/demos/controls/protected/pages/HomePage.tpl +++ b/demos/controls/protected/pages/HomePage.tpl @@ -9,6 +9,7 @@ <com:TLabel Text="test" AssociatedControlID="checkbox"/><br/>
<com:System.Web.UI.WebControls.TButton text="Toggle Button" ForeColor="red" Font.size="18" Click="testClick" /> (requires membership)<br/>
<com:TCheckBox Text="Checkbox" ID="checkbox" AutoPostBack="true" /><br/>
+<com:TRadioButton Text="Radiobutton" ID="radiobutton" AutoPostBack="true" /><br/>
<com:TImage ImageUrl=<%~/fungii_logo.gif %> />
<com:TImageButton ImageUrl=<%~/fungii_logo.gif %> Click="clickImage"/><br/>
<com:THyperLink Text="Visit a 'classless' page" NavigateUrl="?sp=page.plain" /> |
diff --git a/framework/Web/UI/TClientScriptManager.php b/framework/Web/UI/TClientScriptManager.php index c42e664d..ee7ca88f 100644 --- a/framework/Web/UI/TClientScriptManager.php +++ b/framework/Web/UI/TClientScriptManager.php @@ -277,10 +277,10 @@ class TClientScriptManager extends TComponent {
if(count($this->_arrayDeclares))
{
- $str="<script type=\"text/javascript\"><!--\n";
+ $str="<script type=\"text/javascript\">\n//<![CDATA[\n";
foreach($this->_arrayDeclares as $name=>$array)
$str.="var $name=new Array(".implode(',',$array).");\n";
- $str.="\n// --></script>\n";
+ $str.="\n//]]>\n</script>\n";
$writer->write($str);
}
}
@@ -299,13 +299,13 @@ class TClientScriptManager extends TComponent public function renderBeginScripts($writer)
{
if(count($this->_beginScripts))
- $writer->write("<script type=\"text/javascript\"><!--\n".implode("\n",$this->_beginScripts)."\n// --></script>\n");
+ $writer->write("<script type=\"text/javascript\">\n//<![CDATA[\n".implode("\n",$this->_beginScripts)."\n//]]>\n</script>\n");
}
public function renderEndScripts($writer)
{
if(count($this->_endScripts))
- $writer->write("<script type=\"text/javascript\"><!--\n".implode("\n",$this->_endScripts)."\n// --></script>\n");
+ $writer->write("<script type=\"text/javascript\">\n//<![CDATA[\n".implode("\n",$this->_endScripts)."\n//]]>\n</script>\n");
}
public function renderHiddenFields($writer)
@@ -324,7 +324,7 @@ class TClientScriptManager extends TComponent {
if(count($this->_expandoAttributes))
{
- $str="<script type=\"text/javascript\"><!--\n";
+ $str="<script type=\"text/javascript\">\n//<![CDATA[\n";
foreach($this->_expandoAttributes as $controlID=>$attrs)
{
$str.="var $controlID = document.all ? document.all[\"$controlID\"] : document.getElementById(\"$controlID\");\n";
@@ -336,7 +336,7 @@ class TClientScriptManager extends TComponent $str.="{$key}[\"$name\"]=\"$value\";\n";
}
}
- $str.="\n// --></script>\n";
+ $str.="\n//]]>\n</script>\n";
$writer->write($str);
}
}
diff --git a/framework/Web/UI/WebControls/TCheckBox.php b/framework/Web/UI/WebControls/TCheckBox.php index 6b3a2ae4..c5bd88d7 100644 --- a/framework/Web/UI/WebControls/TCheckBox.php +++ b/framework/Web/UI/WebControls/TCheckBox.php @@ -90,7 +90,7 @@ class TCheckBox extends TWebControl implements IPostBackDataHandler, IValidatabl if($this->getCausesValidation())
$page->validate($this->getValidationGroup());
}
- $this->onCheckedChanged(new TEventParameter);
+ $this->onCheckedChanged(null);
}
/**
|