Author: konstantin.mishin Date: 2008-03-24 11:35:43 -0400 (Mon, 24 Mar 2008) New Revision: 7120 Modified: trunk/ui/dataTable/src/main/config/component/columnAttributes.ent trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java Log: RF-2497 Modified: trunk/ui/dataTable/src/main/config/component/columnAttributes.ent =================================================================== --- trunk/ui/dataTable/src/main/config/component/columnAttributes.ent 2008-03-24 15:16:10 UTC (rev 7119) +++ trunk/ui/dataTable/src/main/config/component/columnAttributes.ent 2008-03-24 15:35:43 UTC (rev 7120) @@ -105,9 +105,3 @@ <description>Event for filter input that forces the filtration (default = onchange)</description> <defaultvalue>"onchange"</defaultvalue> </property> -<property> - <name>filterDefaultLabel</name> - <classname>java.lang.String</classname> - <description></description> - <defaultvalue><![CDATA[""]]></defaultvalue> -</property> Modified: trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java =================================================================== --- trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2008-03-24 15:16:10 UTC (rev 7119) +++ trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2008-03-24 15:35:43 UTC (rev 7120) @@ -498,35 +498,19 @@ String buffer) throws IOException { UIInput filterValueInput = (UIInput) column .getFacet(FILTER_INPUT_FACET_NAME); - boolean inplaceInput = true; if (null == filterValueInput) { - try { - filterValueInput = (UIInput) context.getApplication().createComponent("org.richfaces.InplaceInput"); - } catch (FacesException e) { - filterValueInput = (UIInput) context.getApplication().createComponent(UIInput.COMPONENT_TYPE); - inplaceInput = false; - } + filterValueInput = (UIInput) context.getApplication().createComponent(UIInput.COMPONENT_TYPE); filterValueInput.setId(column.getId() + SORT_FILTER_PARAMETER); filterValueInput.setImmediate(true); column.getFacets().put(FILTER_INPUT_FACET_NAME, filterValueInput); filterValueInput.getAttributes().put(HTML.onclick_ATTRIBUTE, "Event.stop(event);"); } - String onkeydownEvent = HTML.onkeydown_ATTRIBUTE; - String filterEvent = (String) column.getAttributes().get("filterEvent"); - if (inplaceInput) { - onkeydownEvent = "oninputkeydown"; - filterValueInput.getAttributes().put("defaultLabel", column.getAttributes().get("filterDefaultLabel")); - } if (null == filterEvent || "".equals(filterEvent)) { filterEvent = "onchange"; } - filterValueInput.getAttributes().put(filterEvent, buffer); - if (!onkeydownEvent.equals(filterEvent)) { - filterValueInput.getAttributes().put(onkeydownEvent, "RichFaces.blurFilterInput(event);"); - } - + filterValueInput.getAttributes().put(filterEvent, buffer); filterValueInput.setValue(column.getAttributes().get("filterValue")); getUtils().encodeBeginFormIfNessesary(context, column);