From 6228873cf9d6471463d2413e7dfd7447f759baf2 Mon Sep 17 00:00:00 2001
From: "christophe.boulain" <>
Date: Wed, 3 Dec 2008 14:22:03 +0000
Subject: Merge from trunk

---
 framework/Web/UI/ActiveControls/TAutoComplete.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

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

diff --git a/framework/Web/UI/ActiveControls/TAutoComplete.php b/framework/Web/UI/ActiveControls/TAutoComplete.php
index c1379ac1..5a3633ec 100644
--- a/framework/Web/UI/ActiveControls/TAutoComplete.php
+++ b/framework/Web/UI/ActiveControls/TAutoComplete.php
@@ -4,7 +4,7 @@
  *
  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2008 PradoSoft
+ * @copyright Copyright &copy; 2005-2008 PradoSoft
  * @license http://www.pradosoft.com/license/
  * @version $Id$
  * @package System.Web.UI.ActiveControls
@@ -328,7 +328,7 @@ class TAutoComplete extends TActiveTextBox implements INamingContainer
 		{
 			$string = strtr($string,array('\t'=>"\t",'\n'=>"\n",'\r'=>"\r"));
 			$token = preg_split('//', $string, -1, PREG_SPLIT_NO_EMPTY);
-			$options['tokens'] = TJavascript::encode($token,false);
+			$options['tokens'] = TJavaScript::encode($token,false);
 		}
 		if($this->getAutoPostBack())
 		{
@@ -343,8 +343,8 @@ class TAutoComplete extends TActiveTextBox implements INamingContainer
 		if(($minchars=$this->getMinChars())!=='')
 			$options['minChars'] = $minchars;
 		if(($frequency=$this->getFrequency())!=='')
-			$options['frequency'] = $frequency;
-		$options['CausesValidation'] = $this->getCausesValidation();
+			$options['frequency'] = $frequency;
+		$options['CausesValidation'] = $this->getCausesValidation();
 		$options['ValidationGroup'] = $this->getValidationGroup();
 		return $options;
 	}
@@ -438,4 +438,3 @@ class TAutoCompleteTemplate extends TComponent implements ITemplate
 	}
 }
 
-?>
-- 
cgit v1.2.3