Author: amarkhel
Date: 2010-08-18 10:47:21 -0400 (Wed, 18 Aug 2010)
New Revision: 18759
Modified:
trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractAutocomplete.java
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/AutocompleteRendererBase.java
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.js
Log:
Change autoFill attribbute to autofill and add tokens attribbute
Modified:
trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractAutocomplete.java
===================================================================
---
trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractAutocomplete.java 2010-08-18
14:10:47 UTC (rev 18758)
+++
trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractAutocomplete.java 2010-08-18
14:47:21 UTC (rev 18759)
@@ -90,12 +90,15 @@
@Attribute
public abstract String getLayout();
+
+ @Attribute
+ public abstract String getTokens();
@Attribute
public abstract Converter getItemConverter();
- @Attribute(defaultValue = "false")
- public abstract boolean isAutoFill();
+ @Attribute(defaultValue = "true")
+ public abstract boolean isAutofill();
@Attribute(defaultValue = "false")
public abstract boolean isDisabled();
@@ -103,7 +106,7 @@
@Attribute(defaultValue = "false")
public abstract boolean isShowButton();
- @Attribute(defaultValue = "false")
+ @Attribute(defaultValue = "true")
public abstract boolean isSelectFirst();
@Attribute(events = @EventName("click"))
Modified:
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/AutocompleteRendererBase.java
===================================================================
---
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/AutocompleteRendererBase.java 2010-08-18
14:10:47 UTC (rev 18758)
+++
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/AutocompleteRendererBase.java 2010-08-18
14:47:21 UTC (rev 18759)
@@ -79,9 +79,10 @@
utils.addToScriptHash(options, "minChars",
attributes.get("minChars"), "1");
utils.addToScriptHash(options, "mode",
attributes.get("mode"), "ajax");
utils.addToScriptHash(options, "filterFunction",
attributes.get("filterFunction"));
- utils.addToScriptHash(options, "autoFill",
attributes.get("autoFill"), "false");
+ utils.addToScriptHash(options, "autofill",
attributes.get("autofill"), "true");
utils.addToScriptHash(options, "disabled",
attributes.get("disabled"), "false");
- utils.addToScriptHash(options, "selectFirst",
attributes.get("selectFirst"), "false");
+ utils.addToScriptHash(options, "selectFirst",
attributes.get("selectFirst"), "true");
+ utils.addToScriptHash(options, "tokens",
attributes.get("tokens"));
utils.addToScriptHash(options, "onbegin",
attributes.get("onbegin"));
utils.addToScriptHash(options, "oncomplete",
attributes.get("oncomplete"));
utils.addToScriptHash(options, "onerror",
attributes.get("onerror"));
Modified:
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.js
===================================================================
---
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.js 2010-08-18
14:10:47 UTC (rev 18758)
+++
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.js 2010-08-18
14:47:21 UTC (rev 18759)
@@ -88,7 +88,7 @@
var defaultOptions = {
selectedItemClass:'rf-au-s',
- autoFill:true,
+ autofill:true,
minChars:1,
selectFirst:true,
ajaxMode:true,
@@ -169,7 +169,7 @@
};
var autoFill = function (inputValue, value) {
- if( this.options.autoFill) {
+ if( this.options.autofill) {
var field = rf.getDomElement(this.fieldId);
var start = rf.Selection.getStart(field);
this.setInputValue(inputValue + value.substring(inputValue.length));