Mirrors/yii
2
0
Fork 0
mirror of https://github.com/yiisoft/yii.git synced 2026-03-22 07:56:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

merge from 1.0.

Browse Source
This commit is contained in:
qiang.xue
2008-12-29 21:02:33 +00:00
parent 267d9f1393
commit e9c5cce048
17 changed files with 206 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
framework/web/widgets/CMaskedTextField.php
View File

@@ -57,6 +57,22 @@ class CMaskedTextField extends CInputWidget
{
list($name,$id)=$this->resolveNameID();
$this->htmlOptions['id']=$id;
$this->registerClientScript();
if($this->hasModel())
echo CHtml::activeTextField($this->model,$this->attribute,$this->htmlOptions);
else
echo CHtml::textField($name,$this->value,$this->htmlOptions);
}
/**
* Registers the needed CSS and JavaScript.
* @since 1.0.1
*/
public function registerClientScript()
{
$id=$this->htmlOptions['id'];
$miOptions=$this->getClientOptions();
$options=$miOptions!==array() ? ','.CJavaScript::encode($miOptions) : '';
$js='';
@@ -67,11 +83,6 @@ class CMaskedTextField extends CInputWidget
$cs=Yii::app()->getClientScript();
$cs->registerCoreScript('maskedinput');
$cs->registerScript('Yii.CMaskedTextField#'.$id,$js);
if($this->hasModel())
echo CHtml::activeTextField($this->model,$this->attribute,$this->htmlOptions);
else
echo CHtml::textField($name,$this->value,$this->htmlOptions);
}
/**