5 files changed, 117 insertions, 129 deletions

diff --git a/demos/quickstart/protected/pages/ActiveControls/Samples/TAutoComplete/Home.page b/demos/quickstart/protected/pages/ActiveControls/Samples/TAutoComplete/Home.page
index 85c0e69f..81d53e13 100755
--- a/demos/quickstart/protected/pages/ActiveControls/Samples/TAutoComplete/Home.page
+++ b/demos/quickstart/protected/pages/ActiveControls/Samples/TAutoComplete/Home.page
@@ -2,7 +2,7 @@
 

 <style type="text/css">

 <!--

-.acomplete { position: relative; z-index: 5; background-color: #EDF5FF; border: 1px solid #243356; }

+.acomplete { position: relative; }

 .acomplete ul, .acomplete li { margin: 0px; padding: 0px; list-style: none; color: #333; }

 .acomplete li { padding: 4px; border-top: 1px solid #ccc; }

 .acomplete .selected { background-color: #ffc; }

@@ -16,7 +16,7 @@
 <tr><td class="samplenote">

 Simple Autocompleter:

 </td><td class="sampleaction">

-<com:TAutoComplete

+<com:TJuiAutoComplete

     ID="AutoComplete"

     OnSuggest="suggestNames"

     OnSuggestionSelected="suggestionSelected1"

@@ -24,27 +24,26 @@ Simple Autocompleter:
     Suggestions.DataKeyField="id" >

 

     <prop:Suggestions.ItemTemplate>

-    <li><%# $this->Data['name'] %></li>

+    <%# $this->Data['name'] %>

     </prop:Suggestions.ItemTemplate>

-</com:TAutoComplete>

+</com:TJuiAutoComplete>

 <com:TActiveLabel ID="Selection1" />

 </td></tr>

 

 <tr><td class="samplenote">

 Autocompleter with multiple selection:

 </td><td class="sampleaction">

-<com:TAutoComplete

+<com:TJuiAutoComplete

     ID="AutoComplete2"

     OnSuggest="suggestNames"

     OnSuggestionSelected="suggestionSelected2"

-    Separator=","

     ResultPanel.CssClass="acomplete"

     Suggestions.DataKeyField="id" >

 

     <prop:Suggestions.ItemTemplate>

-    <li><%# $this->Data['name'] %></li>

+    <%# $this->Data['name'] %>

     </prop:Suggestions.ItemTemplate>

-</com:TAutoComplete>

+</com:TJuiAutoComplete>

 (Use ',' to separate the selected suggestions)

 <com:TActiveLabel ID="Selection2" />

 </td></tr>

diff --git a/demos/quickstart/protected/pages/ActiveControls/Samples/TAutoComplete/Home.php b/demos/quickstart/protected/pages/ActiveControls/Samples/TAutoComplete/Home.php
index 2f74bd37..f8cd904f 100755
--- a/demos/quickstart/protected/pages/ActiveControls/Samples/TAutoComplete/Home.php
+++ b/demos/quickstart/protected/pages/ActiveControls/Samples/TAutoComplete/Home.php
@@ -1,4 +1,5 @@
 <?php
+Prado::using('System.Web.UI.JuiControls.*');
 // $Id: Home.php 3189 2012-07-12 12:16:21Z ctrlaltca $
 class Home extends TPage
 {
diff --git a/framework/Web/Javascripts/source/prado/activecontrols/activecontrols3.js b/framework/Web/Javascripts/source/prado/activecontrols/activecontrols3.js
index 07d54d32..9ca158c8 100644
--- a/framework/Web/Javascripts/source/prado/activecontrols/activecontrols3.js
+++ b/framework/Web/Javascripts/source/prado/activecontrols/activecontrols3.js
@@ -92,22 +92,27 @@ Prado.WebUI.TActiveTextBox = jQuery.klass(Prado.WebUI.TTextBox,
 });
 
 /**
- * TAutoComplete control.
+ * TJuiAutoComplete control.
  */
- /*
-Prado.WebUI.TAutoComplete = jQuery.klass(Autocompleter.Base, Prado.WebUI.TActiveTextBox.prototype);
-Prado.WebUI.TAutoComplete = jQuery.klass(Prado.WebUI.TAutoComplete,
+
+Prado.WebUI.TJuiAutoComplete = jQuery.klass(Prado.WebUI.TActiveTextBox,
 {
 	initialize : function(options)
 	{
 		this.options = options;
 		this.observers = new Array();
 		this.hasResults = false;
-		this.baseInitialize(options.ID, options.ResultPanel, options);
-		jQuery.extend(this.options,
-		{
-			onSuccess : this.onComplete.bind(this)
-		});
+		jQuery.extend(this.options, {
+			source: this.getUpdatedChoices.bind(this),
+			select: this.selectEntry.bind(this),
+		})
+		jQuery('#'+options.ID).autocomplete(this.options)
+		.data( "ui-autocomplete")._renderItem = function( ul, item ) {
+			return $( "<li>" )
+			.attr( "data-value", item.value )
+			.append( $( "<a>" ).html( item.label ) )
+			.appendTo( ul );
+		};
 
 		if(options.AutoPostBack)
 			this.onInit(options);
@@ -125,56 +130,42 @@ Prado.WebUI.TAutoComplete = jQuery.klass(Prado.WebUI.TAutoComplete,
 		}
 	},
 
-	 //Overrides parent implementation, fires onchange event.
-	onClick: function(event)
+	getUpdatedChoices : function(request, callback)
 	{
-	    var element = jQuery(event.target).closest('LI');
-	    this.index = element.autocompleteIndex;
-	    this.selectEntry();
-	    this.hide();
-	    $(this.element).trigger( "change" );
-	},
-
-	getUpdatedChoices : function()
-	{
-		var options = new Array(this.getToken(),"__TAutoComplete_onSuggest__");
-		Prado.Callback(this.options.EventTarget, options, null, this.options);
+		var params = new Array(request.term,"__TJuiAutoComplete_onSuggest__");
+		var options = jQuery.extend(this.options, {
+			'autocompleteCallback' : callback,
+		})
+		Prado.Callback(this.options.EventTarget, params, this.onComplete.bind(this), this.options);
 	},
 
 	/**
 	 * Overrides parent implements, don't update if no results.
-	 * /
-	selectEntry: function()
+	 */
+	selectEntry: function(event, ui)
 	{
-		if(this.hasResults)
-		{
-			this.active = false;
-			this.updateElement(this.getCurrentEntry());
-			var options = [this.index, "__TAutoComplete_onSuggestionSelected__"];
-			Prado.Callback(this.options.EventTarget, options, null, this.options);
-		}
+		var options = [ui.item.id, "__TJuiAutoComplete_onSuggestionSelected__"];
+		Prado.Callback(this.options.EventTarget, options, null, this.options);
 	},
 
-	onComplete : function(request, boundary)
+	onComplete : function(request, result)
   	{
-  		var result = Prado.Element.extractContent(request.transport.responseText, boundary);
-  		if(typeof(result) == "string")
-		{
-			if(result.length > 0)
-			{
-				this.hasResults = true;
-				this.updateChoices(result);
-			}
-			else
-			{
-				this.active = false;
-				this.hasResults = false;
-				this.hide();
-			}
-		}
+  		var that = this;
+  		if(that.options.textCssClass===undefined)
+  		{
+			jQuery.each(result, function(idx, item) {
+				result[idx]['value']=jQuery.trim(item['label']);
+			});
+  		} else {
+			jQuery.each(result, function(idx, item) {
+				result[idx]['value']=jQuery.trim(jQuery(item['label']).find('.'+that.options.textCssClass).html());
+			});
+  		}
+
+		request.options.autocompleteCallback(result);
 	}
 });
-*/
+
 /**
  * Time Triggered Callback class.
  */
diff --git a/framework/Web/UI/ActiveControls/TAutoComplete.php b/framework/Web/UI/JuiControls/TJuiAutoComplete.php
index 5e144040..a8bf2d81 100644
--- a/framework/Web/UI/ActiveControls/TAutoComplete.php
+++ b/framework/Web/UI/JuiControls/TJuiAutoComplete.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * TAutoComplete class file.
+ * TJuiAutoComplete class file.
  *
  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2013 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TAutoComplete.php 3245 2013-01-07 20:23:32Z ctrlaltca $
+ * @version $Id: TJuiAutoComplete.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  */
 
@@ -15,14 +15,14 @@
  */
 Prado::using('System.Web.UI.ActiveControls.TActiveTextBox');
 Prado::using('System.Web.UI.ActiveControls.TCallbackEventParameter');
-
+Prado::using('System.Web.UI.JuiControls.TJuiControlAdapter');
 /**
- * TAutoComplete class.
+ * TJuiAutoComplete class.
  *
- * TAutoComplete is a textbox that provides a list of suggestion on
+ * TJuiAutoComplete is a textbox that provides a list of suggestion on
  * the current partial word typed in the textbox. The suggestions are
  * requested using callbacks, and raises the {@link onSuggestion OnSuggestion}
- * event. The events of the TActiveText (from which TAutoComplete is extended from)
+ * event. The events of the TActiveText (from which TJuiAutoComplete is extended from)
  * and {@link onSuggestion OnSuggestion} are mutually exculsive. That is,
  * if {@link onTextChange OnTextChange} and/or {@link onCallback OnCallback}
  * events are raise, then {@link onSuggestion OnSuggestion} will not be raise, and
@@ -31,7 +31,7 @@ Prado::using('System.Web.UI.ActiveControls.TCallbackEventParameter');
  * The list of suggestions should be set in the {@link onSuggestion OnSuggestion}
  * event handler. The partial word to match the suggestion is in the
  * {@link TCallbackEventParameter::getCallbackParameter TCallbackEventParameter::CallbackParameter}
- * property. The datasource of the TAutoComplete must be set using {@link setDataSource}
+ * property. The datasource of the TJuiAutoComplete must be set using {@link setDataSource}
  * method. This sets the datasource for the suggestions repeater, available through
  * the {@link getSuggestions Suggestions} property. Header, footer templates and
  * other properties of the repeater can be access via the {@link getSuggestions Suggestions}
@@ -63,7 +63,7 @@ Prado::using('System.Web.UI.ActiveControls.TCallbackEventParameter');
  * {@link TCallbackEventParameter::getCallbackParameter TCallbackEventParameter::CallbackParameter}
  * property contains the index of the selected suggestion.
  *
- * TAutoComplete allows multiple suggestions within one textbox with each
+ * TJuiAutoComplete allows multiple suggestions within one textbox with each
  * word or phrase separated by any characters specified in the
  * {@link setSeparator Separator} property. The {@link setFrequency Frequency}
  * and {@link setMinChars MinChars} properties sets the delay and minimum number
@@ -77,11 +77,11 @@ Prado::using('System.Web.UI.ActiveControls.TCallbackEventParameter');
  * "informal" are ignored as text for suggestions.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TAutoComplete.php 3245 2013-01-07 20:23:32Z ctrlaltca $
+ * @version $Id: TJuiAutoComplete.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  * @since 3.1
  */
-class TAutoComplete extends TActiveTextBox implements INamingContainer
+class TJuiAutoComplete extends TActiveTextBox implements INamingContainer, IJuiOptions
 {
 	/**
 	 * @var ITemplate template for repeater items
@@ -93,52 +93,35 @@ class TAutoComplete extends TActiveTextBox implements INamingContainer
 	private $_resultPanel=null;
 
 	/**
-	 * @return string word or token separators (delimiters).
-	 */
-	public function getSeparator()
-	{
-		return $this->getViewState('tokens', '');
-	}
-
-	/**
-	 * @return string word or token separators (delimiters).
-	 */
-	public function setSeparator($value)
-	{
-		$this->setViewState('tokens', TPropertyValue::ensureString($value), '');
-	}
-
-	/**
-	 * @return float maximum delay (in seconds) before requesting a suggestion.
+	 * Creates a new callback control, sets the adapter to
+	 * TActiveControlAdapter. If you override this class, be sure to set the
+	 * adapter appropriately by, for example, by calling this constructor.
 	 */
-	public function getFrequency()
+	public function __construct()
 	{
-		return $this->getViewState('frequency', '');
+		parent::__construct();
+		$this->setAdapter(new TJuiControlAdapter($this));
 	}
 
 	/**
-	 * @param float maximum delay (in seconds) before requesting a suggestion.
-	 * Default is 0.4.
+	 * Object containing defined javascript options
+	 * @return TJuiControlOptions
 	 */
-	public function setFrequency($value)
+	public function getOptions()
 	{
-		$this->setViewState('frequency', TPropertyValue::ensureFloat($value),'');
-	}
-
-	/**
-	 * @return integer minimum number of characters before requesting a suggestion.
-	 */
-	public function getMinChars()
-	{
-		return $this->getViewState('minChars','');
+		static $options;
+		if($options===null)
+			$options=new TJuiControlOptions($this);
+		return $options;
 	}
 
 	/**
-	 * @param integer minimum number of characters before requesting a suggestion.
+	 * Array containing valid javascript options
+	 * @return array()
 	 */
-	public function setMinChars($value)
+	public function getValidOptions()
 	{
-		$this->setViewState('minChars', TPropertyValue::ensureInteger($value), '');
+		return array('appendTo', 'autoFocus', 'delay', 'disabled', 'minLength', 'position', 'source');
 	}
 
 	/**
@@ -172,14 +155,14 @@ class TAutoComplete extends TActiveTextBox implements INamingContainer
 		$token = $param->getCallbackParameter();
 		if(is_array($token) && count($token) == 2)
 		{
-			if($token[1] === '__TAutoComplete_onSuggest__')
+			if($token[1] === '__TJuiAutoComplete_onSuggest__')
 			{
-				$parameter = new TAutoCompleteEventParameter($this->getResponse(), $token[0]);
+				$parameter = new TJuiAutoCompleteEventParameter($this->getResponse(), $token[0]);
 				$this->onSuggest($parameter);
 			}
-			else if($token[1] === '__TAutoComplete_onSuggestionSelected__')
+			else if($token[1] === '__TJuiAutoComplete_onSuggestionSelected__')
 			{
-				$parameter = new TAutoCompleteEventParameter($this->getResponse(), null, $token[0]);
+				$parameter = new TJuiAutoCompleteEventParameter($this->getResponse(), null, $token[0]);
 				$this->onSuggestionSelected($parameter);
 			}
 		}
@@ -267,10 +250,7 @@ class TAutoComplete extends TActiveTextBox implements INamingContainer
 	protected function createRepeater()
 	{
 		$repeater = Prado::createComponent('System.Web.UI.WebControls.TRepeater');
-		$repeater->setHeaderTemplate(new TAutoCompleteTemplate('<ul>'));
-		$repeater->setFooterTemplate(new TAutoCompleteTemplate('</ul>'));
-		$repeater->setItemTemplate(new TTemplate('<li><%# $this->DataItem %></li>',null));
-		$repeater->setEmptyTemplate(new TAutoCompleteTemplate('<ul></ul>'));
+		$repeater->setItemTemplate(new TTemplate('<%# $this->Data %>',null));
 		$this->getControls()->add($repeater);
 		return $repeater;
 	}
@@ -280,7 +260,6 @@ class TAutoComplete extends TActiveTextBox implements INamingContainer
 	 */
 	public function renderEndTag($writer)
 	{
-		$this->getPage()->getClientScript()->registerPradoScript('effects');
 		parent::renderEndTag($writer);
 		$this->renderResultPanel($writer);
 	}
@@ -311,9 +290,17 @@ class TAutoComplete extends TActiveTextBox implements INamingContainer
 	{
 		if($this->getActiveControl()->canUpdateClientSide())
 		{
-			$this->getSuggestions()->render($writer);
-			$boundary = $writer->getWriter()->getBoundary();
-			$this->getResponse()->getAdapter()->setResponseData($boundary);
+			$data=array();
+			$items=$this->getSuggestions()->getItems();
+			$writer = new TTextWriter;
+			for($i=0; $i<$items->Count; $i++)
+			{
+				$items->itemAt($i)->render($writer);
+				$item=$writer->flush();
+				$data[]=array( 'id' => $i, 'label' => $item);
+			}
+
+			$this->getResponse()->getAdapter()->setResponseData($data);
 		}
 	}
 
@@ -324,27 +311,25 @@ class TAutoComplete extends TActiveTextBox implements INamingContainer
 	{
 		//disallow page state update ?
 		//$this->getActiveControl()->getClientSide()->setEnablePageStateUpdate(false);
-		$options = array();
+		$options = $this->getOptions()->toArray();
+		/*
 		if(strlen($string = $this->getSeparator()))
 		{
 			$string = strtr($string,array('\t'=>"\t",'\n'=>"\n",'\r'=>"\r"));
 			$token = preg_split('//', $string, -1, PREG_SPLIT_NO_EMPTY);
 			$options['tokens'] = $token;
 		}
+		*/
 		if($this->getAutoPostBack())
 		{
 			$options = array_merge($options,parent::getPostBackOptions());
 			$options['AutoPostBack'] = true;
 		}
-		if(strlen($select = $this->getTextCssClass()))
-			$options['select'] = $select;
-		$options['ResultPanel'] = $this->getResultPanel()->getClientID();
+		if(strlen($textCssClass = $this->getTextCssClass()))
+			$options['textCssClass'] = $textCssClass;
+		$options['appendTo'] = '#'.$this->getResultPanel()->getClientID();
 		$options['ID'] = $this->getClientID();
 		$options['EventTarget'] = $this->getUniqueID();
-		if(($minchars=$this->getMinChars())!=='')
-			$options['minChars'] = $minchars;
-		if(($frequency=$this->getFrequency())!=='')
-			$options['frequency'] = $frequency;
 		$options['CausesValidation'] = $this->getCausesValidation();
 		$options['ValidationGroup'] = $this->getValidationGroup();
 		return $options;
@@ -363,7 +348,7 @@ class TAutoComplete extends TActiveTextBox implements INamingContainer
 	 */
 	protected function getClientClassName()
 	{
-		return 'Prado.WebUI.TAutoComplete';
+		return 'Prado.WebUI.TJuiAutoComplete';
 	}
 }
 
@@ -375,11 +360,11 @@ class TAutoComplete extends TActiveTextBox implements INamingContainer
  * suggestion selected by the user, -1 if not suggestion is selected.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TAutoComplete.php 3245 2013-01-07 20:23:32Z ctrlaltca $
+ * @version $Id: TJuiAutoComplete.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  * @since 3.1
  */
-class TAutoCompleteEventParameter extends TCallbackEventParameter
+class TJuiAutoCompleteEventParameter extends TCallbackEventParameter
 {
 	private $_selectedIndex=-1;
 
@@ -410,17 +395,17 @@ class TAutoCompleteEventParameter extends TCallbackEventParameter
 }
 
 /**
- * TAutoCompleteTemplate class.
+ * TJuiAutoCompleteTemplate class.
  *
- * TAutoCompleteTemplate is the default template for TAutoCompleteTemplate
+ * TJuiAutoCompleteTemplate is the default template for TJuiAutoCompleteTemplate
  * item template.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TAutoComplete.php 3245 2013-01-07 20:23:32Z ctrlaltca $
+ * @version $Id: TJuiAutoComplete.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  * @since 3.1
  */
-class TAutoCompleteTemplate extends TComponent implements ITemplate
+class TJuiAutoCompleteTemplate extends TComponent implements ITemplate
 {
 	private $_template;
 
@@ -438,4 +423,3 @@ class TAutoCompleteTemplate extends TComponent implements ITemplate
 		$parent->getControls()->add($this->_template);
 	}
 }
-
diff --git a/jQuery-PORTING.txt b/jQuery-PORTING.txt
index b5635cff..9506aff4 100644
--- a/jQuery-PORTING.txt
+++ b/jQuery-PORTING.txt
@@ -1,3 +1,5 @@
+JAVASCRIPT
+
 Get element by id
 OLD: $('element_id')
 NEW: $('#element_id') // for the extended element
@@ -79,4 +81,15 @@ NEW: $(element).focus();
 ---
 Get element size
 OLD: element.getWidth(), element.getHeight()
-NEW: element.width, element.height
\ No newline at end of file
+NEW: element.width, element.height
+
+
+
+CONTROLS
+
+TAutoCompleter doesn't exists anymore, use TJuiAutoCompleter instead, upgrading the code:
+ * No more Frequency property.
+ * minChars property is now minLength 
+ * only the ItemTemplate is supported for the Suggestions repeater;
+ * in the ItemTemplate you don't need to render the <li/> anymore, but only the content itself
+ * No Multiple selection support (by now, can be added in the future)