merge from 1.0.

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

View File

@@ -81,6 +81,18 @@ class CMultiFileUpload extends CWidget
}
$this->htmlOptions['id']=$id;
$this->registerClientScript();
echo CHtml::fileField($name,'',$this->htmlOptions);
}
/**
* Registers the needed CSS and JavaScript.
* @since 1.0.1
*/
public function registerClientScript()
{
$id=$this->htmlOptions['id'];
$mfOptions=array();
if($this->accept!==null)
$mfOptions['accept']=$this->accept;
@@ -99,7 +111,5 @@ class CMultiFileUpload extends CWidget
$cs=Yii::app()->getClientScript();
$cs->registerCoreScript('multifile');
$cs->registerScript('Yii.CMultiFileUpload#'.$id,"jQuery(\"#{$id}\").MultiFile({$options});");
echo CHtml::fileField($name,'',$this->htmlOptions);
}
}