From 3dcb3c4188c8d5836a2db0847d2fc43bc7e7e4d8 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Mon, 20 Feb 2006 06:23:38 +0000
Subject: Cleaned up TForm and THead.

---
 framework/Web/UI/TPage.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'framework/Web/UI/TPage.php')

diff --git a/framework/Web/UI/TPage.php b/framework/Web/UI/TPage.php
index bbfca2fe..aa188a03 100644
--- a/framework/Web/UI/TPage.php
+++ b/framework/Web/UI/TPage.php
@@ -690,13 +690,11 @@ class TPage extends TTemplateControl
 		{
 			if($this->_focus)
 			{
-				if(is_string($this->_focus))
-					$cs->registerFocusScript($this->_focus);
-				else if(($this->_focus instanceof TControl) && $this->_focus->getVisible(true))
-					$cs->registerFocusScript($this->_focus->getClientID());
+				if(($this->_focus instanceof TControl) && $this->_focus->getVisible(true) || is_string($this->_focus))
+					$cs->registerFocusControl($this->_focus);
 			}
 			else if($this->_postData && ($lastFocus=$this->_postData->itemAt(self::FIELD_LASTFOCUS))!==null)
-				$cs->registerFocusScript($lastFocus);
+				$cs->registerFocusControl($lastFocus);
 			$cs->renderHiddenFields($writer);
 			$cs->renderScriptFiles($writer);
 			$cs->renderEndScripts($writer);
-- 
cgit v1.2.3