From richfaces-svn-commits at lists.jboss.org Mon Nov  1 10:02:22 2010
Content-Type: multipart/mixed; boundary="===============2882247379397240161=="
MIME-Version: 1.0
From: richfaces-svn-commits at lists.jboss.org
To: richfaces-svn-commits at lists.jboss.org
Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r19828 - in trunk:
 ui/input/ui/src/main/java/org/richfaces/component and 2 other directories.
Date: Mon, 01 Nov 2010 10:02:22 -0400
Message-ID: <201011011402.oA1E2MnJ028214@svn01.web.mwc.hst.phx2.redhat.com>

--===============2882247379397240161==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: pyaschenko
Date: 2010-11-01 10:02:21 -0400 (Mon, 01 Nov 2010)
New Revision: 19828

Modified:
   trunk/examples/input-demo/src/main/webapp/examples/autocomplete.xhtml
   trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractAutocomp=
lete.java
   trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/AutocompleteRend=
ererBase.java
   trunk/ui/input/ui/src/main/templates/autocomplete.template.xml
Log:
http://jira.jboss.com/jira/browse/RF-9585

Modified: trunk/examples/input-demo/src/main/webapp/examples/autocomplete.x=
html
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/examples/input-demo/src/main/webapp/examples/autocomplete.xhtml	2=
010-11-01 13:50:44 UTC (rev 19827)
+++ trunk/examples/input-demo/src/main/webapp/examples/autocomplete.xhtml	2=
010-11-01 14:02:21 UTC (rev 19828)
@@ -30,8 +30,14 @@
 		<div style=3D"height: 300px; width: 300px; overflow: auto; float:left;">=
Text
 		block text block text block text block text block text block text
 		block text block
+		<script type=3D"text/javascript">
+			function customFilterFunction(subString, value) {
+				if(subString.length>1)
+					if(value.indexOf(subString)!=3D-1) return true;
+			}
+		</script>
 =

-		<input:autocomplete autofill=3D"false" id=3D"myAutocomplete" clientFilte=
r=3D"if(subString.length>1) if(value.indexOf(subString)!=3D-1) return true;=
" mode=3D"#{autoCompleteBean.mode}" minChars=3D"2" autocompleteMethod=3D"#{=
autoCompleteBean.autocomplete}" var=3D"country" fetchValue=3D"#{country.nam=
e}" showButton=3D"true"
+		<input:autocomplete autofill=3D"false" id=3D"myAutocomplete" clientFilte=
rFunction=3D"customFilterFunction" mode=3D"#{autoCompleteBean.mode}" minCha=
rs=3D"2" autocompleteMethod=3D"#{autoCompleteBean.autocomplete}" var=3D"cou=
ntry" fetchValue=3D"#{country.name}" showButton=3D"true"
 		 value =3D "#{autoCompleteBean.value}"
 		 onchange=3D"return onEvent.call(this, event);" onselectitem=3D"return o=
nEvent.call(this, event);" onblur=3D"return onEvent.call(this, event);" onf=
ocus=3D"return onEvent.call(this, event);">
 			#{country.name} #{country.iso} #{country.domain}

Modified: trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractA=
utocomplete.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractAutocom=
plete.java	2010-11-01 13:50:44 UTC (rev 19827)
+++ trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractAutocom=
plete.java	2010-11-01 14:02:21 UTC (rev 19828)
@@ -194,7 +194,7 @@
     public abstract String getOnbeforedomupdate();
     =

     @Attribute
-    public abstract String getClientFilter();
+    public abstract String getClientFilterFunction();
 =

     @Override
     public Converter getConverter() {

Modified: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/Autocompl=
eteRendererBase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/AutocompleteRen=
dererBase.java	2010-11-01 13:50:44 UTC (rev 19827)
+++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/AutocompleteRen=
dererBase.java	2010-11-01 14:02:21 UTC (rev 19828)
@@ -45,7 +45,7 @@
 import javax.servlet.jsp.jstl.sql.Result;
 =

 import org.ajax4jsf.context.AjaxContext;
-import org.ajax4jsf.javascript.JSFunctionDefinition;
+import org.ajax4jsf.javascript.JSReference;
 import org.richfaces.component.AbstractAutocomplete;
 import org.richfaces.component.AutocompleteLayout;
 import org.richfaces.component.MetaComponentResolver;
@@ -69,14 +69,11 @@
 })
 public abstract class AutocompleteRendererBase extends InputRendererBase i=
mplements MetaComponentRenderer {
 =

-    public JSFunctionDefinition getClientFilterFunction(UIComponent compon=
ent) {
+    public JSReference getClientFilterFunction(UIComponent component) {
         AbstractAutocomplete autocomplete =3D (AbstractAutocomplete) compo=
nent;
-        String clientFilter =3D (String) autocomplete.getAttributes().get(=
"clientFilter");
+        String clientFilter =3D (String) autocomplete.getAttributes().get(=
"clientFilterFunction");
         if (clientFilter !=3D null && clientFilter.length() !=3D 0) {
-            JSFunctionDefinition clientFilterFunction =3D new JSFunctionDe=
finition("subString");
-            clientFilterFunction.addParameter("value");
-            clientFilterFunction.addToBody(clientFilter);
-            return clientFilterFunction;
+            return new JSReference(clientFilter);
         }
 =

         return null;

Modified: trunk/ui/input/ui/src/main/templates/autocomplete.template.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/ui/input/ui/src/main/templates/autocomplete.template.xml	2010-11-=
01 13:50:44 UTC (rev 19827)
+++ trunk/ui/input/ui/src/main/templates/autocomplete.template.xml	2010-11-=
01 14:02:21 UTC (rev 19828)
@@ -77,8 +77,8 @@
                     <cdk:scriptOption attributes=3D"onbegin oncomplete one=
rror onbeforedomupdate onchange onselectitem onfocus onblur" wrapper=3D"eve=
ntHandler"/> =

                     <cdk:scriptOption name=3D"filterFunction" value=3D"#{g=
etClientFilterFunction(component)}" />
                     <cdk:scriptOption name=3D"isCachedAjax" value=3D"#{'aj=
ax'=3D=3Dmode ? false : true}" defaultValue=3D"true" />
-		    <cdk:scriptOption name=3D"ajaxMode" value=3D"#{'client'=3D=3Dmode||'=
lazyClient'=3D=3Dmode ? false : true}" defaultValue=3D"true" />
-		    <cdk:scriptOption name=3D"lazyClientMode" value=3D"#{'lazyClient'=3D=
=3Dmode ? true : false}" defaultValue=3D"false" /> =

+		    		<cdk:scriptOption name=3D"ajaxMode" value=3D"#{'client'=3D=3Dmode|=
|'lazyClient'=3D=3Dmode ? false : true}" defaultValue=3D"true" />
+		    		<cdk:scriptOption name=3D"lazyClientMode" value=3D"#{'lazyClient'=
=3D=3Dmode ? true : false}" defaultValue=3D"false" /> =

                 </cdk:scriptObject>
                 new RichFaces.ui.Autocomplete("#{clientId}",
                 "#{clientId}Input", #{toScriptArgs(options)}


--===============2882247379397240161==--