From fc0db15ebce101602fb1cbfa8f6a5cc0f8b58be4 Mon Sep 17 00:00:00 2001
From: Fabio Bas <ctrlaltca@gmail.com>
Date: Mon, 6 Jan 2014 22:41:46 +0100
Subject: Happy 2014! (cherry picked from commit
 7915cde127eba2a5143fd45c6b32e81ad91bdfae)

Conflicts:
	framework/Data/Common/Mssql/TMssqlMetaData.php
	framework/Data/Common/Mysql/TMysqlMetaData.php
	framework/Data/Common/Oracle/TOracleMetaData.php
	framework/Data/Common/Pgsql/TPgsqlMetaData.php
	framework/Data/Common/Sqlite/TSqliteMetaData.php
	framework/Data/Common/TDbMetaData.php
	framework/Web/UI/ActiveControls/TCallbackClientScript.php
	framework/Web/UI/JuiControls/TJuiAutoComplete.php
	framework/Web/UI/JuiControls/TJuiControlAdapter.php
	framework/Web/UI/JuiControls/TJuiDraggable.php
	framework/Web/UI/JuiControls/TJuiDroppable.php
	framework/Web/UI/JuiControls/TJuiResizable.php
	framework/Web/UI/JuiControls/TJuiSelectable.php
	framework/Web/UI/JuiControls/TJuiSortable.php
	framework/Wsat/TWsatARGenerator.php
	framework/Wsat/TWsatService.php
	framework/Wsat/pages/TWsatGenerateAR.php
	framework/Wsat/pages/TWsatHome.php
	framework/Wsat/pages/TWsatLogin.php
	framework/Wsat/pages/TWsatScaffolding.php
---
 framework/Web/UI/ActiveControls/TCallbackClientScript.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'framework/Web/UI/ActiveControls/TCallbackClientScript.php')

diff --git a/framework/Web/UI/ActiveControls/TCallbackClientScript.php b/framework/Web/UI/ActiveControls/TCallbackClientScript.php
index 40051f76..70fdfdf7 100644
--- a/framework/Web/UI/ActiveControls/TCallbackClientScript.php
+++ b/framework/Web/UI/ActiveControls/TCallbackClientScript.php
@@ -4,7 +4,7 @@
  *
  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
  * @version $Id: TCallbackClientScript.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
@@ -127,7 +127,7 @@ class TCallbackClientScript extends TApplicationComponent
 
 	/**
 	 * Client script to click on an element. <b>This client-side function is unpredictable.</b>
-	 * 
+	 *
 	 * @param TControl control element or element id
 	 */
 	public function click($control)
@@ -182,14 +182,14 @@ class TCallbackClientScript extends TApplicationComponent
 		{
 			$promptText		= $control->getPromptText();
 			$promptValue	= $control->getPromptValue();
-			
+
 			if($promptValue==='')
 				$promptValue = $promptText;
-	
+
 			if($promptValue!=='')
 				$options[] = array($promptText, $promptValue);
 		}
-		
+
 		foreach($items as $item)
 		{
 			if($item->getHasAttributes())
@@ -301,6 +301,7 @@ class TCallbackClientScript extends TApplicationComponent
 	/**
 	 * Scroll the top of the browser viewing area to the location of the
 	 * element.
+	 *
 	 * @param TControl control element or element id
 	 */
 	public function scrollTo($element)
@@ -449,7 +450,7 @@ class TCallbackClientScript extends TApplicationComponent
 		{
 			$boundary = $this->getResponseContentBoundary($content);
 		}
-		
+
 		$this->callClientFunction('Prado.Element.appendScriptBlock', array($boundary));
 	}
 
-- 
cgit v1.2.3