Author: alexsmirnov Date: 2011-03-22 15:34:17 -0400 (Tue, 22 Mar 2011) New Revision: 22292 Added: branches/4.0.X/examples/validator-demo/src/main/webapp/bg.jpg Modified: branches/4.0.X/examples/validator-demo/src/main/webapp/examples/clientAndajaxValidator.xhtml branches/4.0.X/ui/validator/ui/src/main/resources/META-INF/resources/org.richfaces/richfaces-csv.js Log: RESOLVED - issue RFPL-1352: CSV: some validators do not work ajax fallback with MyFaces https://issues.jboss.org/browse/RFPL-1352 Added: branches/4.0.X/examples/validator-demo/src/main/webapp/bg.jpg =================================================================== (Binary files differ) Property changes on: branches/4.0.X/examples/validator-demo/src/main/webapp/bg.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: branches/4.0.X/examples/validator-demo/src/main/webapp/examples/clientAndajaxValidator.xhtml =================================================================== --- branches/4.0.X/examples/validator-demo/src/main/webapp/examples/clientAndajaxValidator.xhtml 2011-03-22 09:09:34 UTC (rev 22291) +++ branches/4.0.X/examples/validator-demo/src/main/webapp/examples/clientAndajaxValidator.xhtml 2011-03-22 19:34:17 UTC (rev 22292) @@ -25,13 +25,15 @@ <csv:message id="uiMessage" for="text" /> <h:outputLabel for="number" value="Four annotations for number"/> <h:inputText id="number" value="#{test.numbers}"> - <csv:validator /> + <csv:validator onbeforesubmit="alert('Before')"/> </h:inputText> <h:outputText id="outNum" value="#{test.numbers}"></h:outputText> <csv:message id="uiNumMessage" for="number" /> </h:panelGrid> <h:commandButton value="Submit form"/> - <a4j:commandButton value="AJAX Submit" render="out"/> + <h:graphicImage value="/bg.jpg"> + <a4j:ajax event="click" value="AJAX Submit" render="out" onbeforesubmit="alert('Before AJAX')"/> + </h:graphicImage> </h:form> <csv:messages /> </ui:define> Modified: branches/4.0.X/ui/validator/ui/src/main/resources/META-INF/resources/org.richfaces/richfaces-csv.js =================================================================== --- branches/4.0.X/ui/validator/ui/src/main/resources/META-INF/resources/org.richfaces/richfaces-csv.js 2011-03-22 09:09:34 UTC (rev 22291) +++ branches/4.0.X/ui/validator/ui/src/main/resources/META-INF/resources/org.richfaces/richfaces-csv.js 2011-03-22 19:34:17 UTC (rev 22292) @@ -107,9 +107,8 @@ } }; - var getValue = function(id) { + var getValue = function(element) { var value; - var element = rf.getDomElement(id); if (valueExtractors[element.type]) { value = valueExtractors[element.type](element); } else if(undefined !== element.value ){ @@ -150,7 +149,8 @@ rf.Event.fire(window.document, rf.Event.MESSAGE_EVENT_TYPE, {'sourceId':componentId }); }, validate: function (event, id, element, params) { - var value = getValue(element || id); + var element = rf.getDomElement(element || id); + var value = getValue(element); var convertedValue; var converter = params.c; rf.csv.clearMessage(id);