From 0b60336c37f91d79ecaefbe0f8b86cc324264451 Mon Sep 17 00:00:00 2001
From: ctrlaltca <>
Date: Thu, 10 May 2012 21:09:10 +0000
Subject: fix for #399, addresses ratings.js and inlineeditor.js

---
 .../Web/UI/ActiveControls/TInPlaceTextBox.php      | 19 ++++++++++
 framework/Web/UI/WebControls/TRatingList.php       | 12 ++++++-
 framework/Web/UI/WebControls/TTextBox.php          | 42 +++++++++++-----------
 3 files changed, 51 insertions(+), 22 deletions(-)

(limited to 'framework/Web/UI')

diff --git a/framework/Web/UI/ActiveControls/TInPlaceTextBox.php b/framework/Web/UI/ActiveControls/TInPlaceTextBox.php
index 47d8022e..1f19918e 100644
--- a/framework/Web/UI/ActiveControls/TInPlaceTextBox.php
+++ b/framework/Web/UI/ActiveControls/TInPlaceTextBox.php
@@ -268,4 +268,23 @@ class TInPlaceTextBox extends TActiveTextBox
 			$this->getClientClassName(), $this->getPostBackOptions());
 	}
 
+	/**
+	 * Registers CSS and JS.
+	 * This method is invoked right before the control rendering, if the control is visible.
+	 * @param mixed event parameter
+	 */
+	public function onPreRender($param)
+	{
+		parent::onPreRender($param);
+		$this->registerClientScript();
+	}
+
+	/**
+	 * Registers the relevant JavaScript.
+	 */
+	protected function registerClientScript()
+	{
+		$cs=$this->getPage()->getClientScript();
+		$cs->registerPradoScript('inlineeditor');
+	}
 }
diff --git a/framework/Web/UI/WebControls/TRatingList.php b/framework/Web/UI/WebControls/TRatingList.php
index f939a210..457bcd74 100644
--- a/framework/Web/UI/WebControls/TRatingList.php
+++ b/framework/Web/UI/WebControls/TRatingList.php
@@ -283,7 +283,8 @@ class TRatingList extends TRadioButtonList
 		parent::onPreRender($param);
 		$this->publishStyle($this->getRatingStyle());
 		$this->_ratingImages = $this->publishImages($this->getRatingStyle());
- 	}
+ 		$this->registerClientScript();
+	}
 
 	/**
 	 * @param string rating style name
@@ -312,6 +313,15 @@ class TRatingList extends TRadioButtonList
 		return $files;
  	}
 
+	/**
+	 * Registers the relevant JavaScript.
+	 */
+	protected function registerClientScript()
+	{
+		$cs=$this->getPage()->getClientScript();
+		$cs->registerPradoScript('ratings');
+	}
+
 	/**
 	 * @param string asset file in the self::SCRIPT_PATH directory.
 	 * @return string asset file url.
diff --git a/framework/Web/UI/WebControls/TTextBox.php b/framework/Web/UI/WebControls/TTextBox.php
index a19d35cd..6535fc63 100644
--- a/framework/Web/UI/WebControls/TTextBox.php
+++ b/framework/Web/UI/WebControls/TTextBox.php
@@ -4,7 +4,7 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2011 PradoSoft
+ * @copyright Copyright &copy; 2005-2011 PradoSoft
  * @license http://www.pradosoft.com/license/
  * @version $Id$
  * @package System.Web.UI.WebControls
@@ -67,7 +67,7 @@ class TTextBox extends TWebControl implements IPostBackDataHandler, IValidatable
 	 */
 	private $_safeText;
 	private $_dataChanged=false;
-	private $_isValid=true;
+	private $_isValid=true;
 
 	/**
 	 * @return string tag name of the textbox
@@ -129,7 +129,7 @@ class TTextBox extends TWebControl implements IPostBackDataHandler, IValidatable
 					$writer->addAttribute('value',$text);
 				$writer->addAttribute('type','password');
 			}
-
+
 			if(($act=$this->getAutoCompleteType())!=='None')
 			{
 				if($act==='Disabled')
@@ -149,7 +149,7 @@ class TTextBox extends TWebControl implements IPostBackDataHandler, IValidatable
 					$writer->addAttribute('vcard_name','vCard.'.$act);
 				}
 			}
-
+
 			if(($cols=$this->getColumns())>0)
 				$writer->addAttribute('size',"$cols");
 			if(($maxLength=$this->getMaxLength())>0)
@@ -246,23 +246,23 @@ class TTextBox extends TWebControl implements IPostBackDataHandler, IValidatable
 		return $this->getText();
 	}
 
-	/**
-	 * Returns true if this control validated successfully.
-	 * Defaults to true.
-	 * @return bool wether this control validated successfully.
-	 */
-	public function getIsValid()
-	{
-	    return $this->_isValid;
-	}
-	/**
-	 * @param bool wether this control is valid.
-	 */
-	public function setIsValid($value)
-	{
-	    $this->_isValid=TPropertyValue::ensureBoolean($value);
-	}
-
+	/**
+	 * Returns true if this control validated successfully.
+	 * Defaults to true.
+	 * @return bool wether this control validated successfully.
+	 */
+	public function getIsValid()
+	{
+	    return $this->_isValid;
+	}
+	/**
+	 * @param bool wether this control is valid.
+	 */
+	public function setIsValid($value)
+	{
+	    $this->_isValid=TPropertyValue::ensureBoolean($value);
+	}
+
 	/**
 	 * Raises <b>OnTextChanged</b> event.
 	 * This method is invoked when the value of the {@link getText Text}
-- 
cgit v1.2.3