From 16c588209ce9197f13f343c83145446c4d92822a Mon Sep 17 00:00:00 2001 From: xue <> Date: Sat, 31 Dec 2005 03:44:30 +0000 Subject: --- framework/Web/UI/WebControls/TDropDownList.php | 19 ++++--------------- framework/Web/UI/WebControls/TListBox.php | 2 +- 2 files changed, 5 insertions(+), 16 deletions(-) (limited to 'framework') diff --git a/framework/Web/UI/WebControls/TDropDownList.php b/framework/Web/UI/WebControls/TDropDownList.php index 5e243065..9b9b1b92 100644 --- a/framework/Web/UI/WebControls/TDropDownList.php +++ b/framework/Web/UI/WebControls/TDropDownList.php @@ -10,31 +10,20 @@ class TDropDownList extends TListControl implements IPostBackDataHandler public function loadPostData($key,$values) { - //TODO: Need to doublecheck!!@! if(!$this->getEnabled(true)) return false; - $selections=isset($values[$key])?$values[$key]:null; $this->ensureDataBound(); - if($selections!==null) + $selection=isset($values[$key])?$values[$key]:null; + if($selection!==null) { - $items=$this->getItems(); - $selection=is_array($selections)?$selections[0]:$selections; - $index=$items->findIndexByValue($selection,false); + $index=$this->getItems()->findIndexByValue($selection,false); if($this->getSelectedIndex()!==$index) { $this->setSelectedIndex($index); return true; } - else - return false; } - else if($this->getSelectedIndex()!==-1) - { - $this->clearSelection(); - return true; - } - else - return false; + return false; } public function raisePostDataChangedEvent() diff --git a/framework/Web/UI/WebControls/TListBox.php b/framework/Web/UI/WebControls/TListBox.php index 4aabbbac..7f47a49e 100644 --- a/framework/Web/UI/WebControls/TListBox.php +++ b/framework/Web/UI/WebControls/TListBox.php @@ -24,8 +24,8 @@ class TListBox extends TListControl implements IPostBackDataHandler { if(!$this->getEnabled(true)) return false; - $selections=isset($values[$key])?$values[$key]:null; $this->ensureDataBound(); + $selections=isset($values[$key])?$values[$key]:null; if($selections!==null) { $items=$this->getItems(); -- cgit v1.2.3