Author: lfryc(a)redhat.com Date: 2010-11-16 12:04:02 -0500 (Tue, 16 Nov 2010) New Revision: 20060 Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JQueueBean.java modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/extending.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/nested.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/nestedExtension.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/formQueue.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/globalQueue.xhtml modules/tests/metamer/trunk/application/src/main/webapp/resources/metamer/clientTimeWatcher.xhtml Log: used metamer:clientTimeWatcher in all queue/attachQueue samples (RFPL-923) Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JQueueBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JQueueBean.java 2010-11-16 17:02:12 UTC (rev 20059) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JQueueBean.java 2010-11-16 17:04:02 UTC (rev 20060) @@ -62,6 +62,7 @@ // initialize attributes attributes = Attributes.getUIComponentAttributes(UIQueue.class, getClass()); attributes.setAttribute("rendered", true); + attributes.setAttribute("requestDelay", 750); // hidden attributes attributes.remove("status"); Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/extending.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/extending.xhtml 2010-11-16 17:02:12 UTC (rev 20059) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/extending.xhtml 2010-11-16 17:04:02 UTC (rev 20060) @@ -39,13 +39,6 @@ function add(element) { element.innerHTML = 1 + parseInt(element.innerHTML); } - - function updateDifferenceTime() { - var eventTime = parseInt(jQuery(#{rich:element('eventTime:outputTime')}).attr('title')); - var beginTime = parseInt(jQuery(#{rich:element('beginTime:outputTime')}).attr('title')); - - jQuery(#{rich:element('differenceTime')}).text(beginTime - eventTime); - } </script> </ui:define> @@ -68,8 +61,8 @@ <fieldset> <legend>&lt;a4j:ajax event="keyup" &gt;</legend> - <a4j:ajax event="keyup" render="output1, output2" execute="@form" onbegin="add(#{rich:element('requests')}); refresh(#{rich:element('beginTime:outputTime')}); " - oncomplete="refresh(#{rich:element('completeTime:outputTime')}); updateDifferenceTime();" onbeforedomupdate="add(#{rich:element('updates')});"> + <a4j:ajax event="keyup" render="output1, output2" execute="@form" onbegin="add(#{rich:element('requests')}); #{rich:element('timeWatcher:grid')}.begin(); " + oncomplete="#{rich:element('timeWatcher:grid')}.complete(); #{rich:element('timeWatcher:grid')}.difference();" onbeforedomupdate="add(#{rich:element('updates')});"> <div>&lt;a4j:attachQueue /&gt;</div> @@ -84,8 +77,8 @@ requestGroupingId="#{a4jAttachQueueBean.attributes['requestGroupingId'].value}" timeout="#{a4jAttachQueueBean.attributes['timeout'].value}"/> - <h:inputText id="input1" value="#{a4jAttachQueueBean.text1}" onkeyup="add(#{rich:element('events')}); refresh(#{rich:element('eventTime:outputTime')});"/> - <h:inputText id="input2" value="#{a4jAttachQueueBean.text2}" onkeyup="add(#{rich:element('events')}); refresh(#{rich:element('eventTime:outputTime')});"/> + <h:inputText id="input1" value="#{a4jAttachQueueBean.text1}" onkeyup="add(#{rich:element('events')}); #{rich:element('timeWatcher:grid')}.event();"/> + <h:inputText id="input2" value="#{a4jAttachQueueBean.text2}" onkeyup="add(#{rich:element('events')}); #{rich:element('timeWatcher:grid')}.event();"/> </a4j:ajax> </fieldset> @@ -101,15 +94,9 @@ <h:outputText value="0" id="requests" /> DOM updates count: <h:outputText value="0" id="updates" /> - Difference time: - <h:outputText value="" id="differenceTime" /> </h:panelGrid> - <h:panelGrid columns="1"> - <metamer:clientTime id="eventTime" label="Event Time:" /> - <metamer:clientTime id="beginTime" label="Begin Time:" /> - <metamer:clientTime id="completeTime" label="Complete Time:" /> - </h:panelGrid> + <metamer:clientTimeWatcher id="timeWatcher" /> </ui:define> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/nested.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/nested.xhtml 2010-11-16 17:02:12 UTC (rev 20059) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/nested.xhtml 2010-11-16 17:04:02 UTC (rev 20060) @@ -105,8 +105,6 @@ <h:outputText value="0" id="updates" /> </h:panelGrid> - - <metamer:clientTimeWatcher id="timeWatcher" events="2" /> </ui:define> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/nestedExtension.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/nestedExtension.xhtml 2010-11-16 17:02:12 UTC (rev 20059) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/nestedExtension.xhtml 2010-11-16 17:04:02 UTC (rev 20060) @@ -39,15 +39,6 @@ function add(element) { element.innerHTML = 1 + parseInt(element.innerHTML); } - - function updateDifferenceTime() { - var eventTime1 = parseInt(jQuery(#{rich:element('eventTime1:outputTime')}).attr('title')); - var eventTime2 = parseInt(jQuery(#{rich:element('eventTime2:outputTime')}).attr('title')); - var beginTime = parseInt(jQuery(#{rich:element('beginTime:outputTime')}).attr('title')); - - var eventTime = Math.max(eventTime1, eventTime2); - jQuery(#{rich:element('differenceTime')}).text(beginTime - eventTime); - } </script> </ui:define> @@ -71,9 +62,9 @@ <legend>&lt;a4j:ajax event='click' ... &gt;</legend> <a4j:ajax event="click" execute="@form" - onbegin="add(#{rich:element('requests')}); refresh(#{rich:element('beginTime:outputTime')}); " + onbegin="add(#{rich:element('requests')}); #{rich:element('timeWatcher:grid')}.begin(); " onbeforedomupdate="add(#{rich:element('updates')});" - oncomplete="refresh(#{rich:element('completeTime:outputTime')}); updateDifferenceTime(); "> + oncomplete="#{rich:element('timeWatcher:grid')}.complete(); #{rich:element('timeWatcher:grid')}.difference(); "> <div>&lt;a4j:attachQueue id="..1" /&gt;</div> @@ -89,25 +80,25 @@ timeout="#{a4jAttachQueueBean.attributes['timeout'].value}" /> <h:inputText id="input1" value="#{a4jAttachQueueBean.text1}" - onclick="add(#{rich:element('events1')}); refresh(#{rich:element('eventTime1:outputTime')}); " /> + onclick="add(#{rich:element('events1')}); #{rich:element('timeWatcher:grid')}.event(1); " /> <a4j:commandButton - onclick="add(#{rich:element('events1')}); refresh(#{rich:element('eventTime1:outputTime')}); " + onclick="add(#{rich:element('events1')}); #{rich:element('timeWatcher:grid')}.event(1); " id="a4jCommandButton1" value="First button" /> <fieldset> <legend>&lt;a4j:ajax event='valueChange' ... &gt;</legend> <a4j:ajax event="valueChange" render="output2" execute="@form" - onbegin="add(#{rich:element('requests')}); refresh(#{rich:element('beginTime:outputTime')}); " + onbegin="add(#{rich:element('requests')}); #{rich:element('timeWatcher:grid')}.begin(); " onbeforedomupdate="add(#{rich:element('updates')});" - oncomplete="refresh(#{rich:element('completeTime:outputTime')}); updateDifferenceTime();"> + oncomplete="#{rich:element('timeWatcher:grid')}.complete(); #{rich:element('timeWatcher:grid')}.difference(); "> <h:inputText id="input2" value="#{a4jAttachQueueBean.text2}" - onclick="add(#{rich:element('events1')}); refresh(#{rich:element('eventTime1:outputTime')}); " - onchange="add(#{rich:element('events2')}); refresh(#{rich:element('eventTime2:outputTime')}); " /> + onclick="add(#{rich:element('events1')}); #{rich:element('timeWatcher:grid')}.event(1); " + onchange="add(#{rich:element('events2')}); #{rich:element('timeWatcher:grid')}.event(2); " /> <a4j:commandButton id="a4jCommandButton2" value="First button" - onclick="add(#{rich:element('events1')}); refresh(#{rich:element('eventTime1:outputTime')}); " /> + onclick="add(#{rich:element('events1')}); #{rich:element('timeWatcher:grid')}.event(1); " /> <div>&lt;a4j:attachQueue id="..2" /&gt;</div> @@ -144,15 +135,10 @@ <h:outputText value="0" id="requests" /> DOM updates count: <h:outputText value="0" id="updates" /> - Difference time: - <h:outputText value="" id="differenceTime" /> </h:panelGrid> <h:panelGrid columns="1"> - <metamer:clientTime id="eventTime1" label="Event 1 Time:" /> - <metamer:clientTime id="eventTime2" label="Event 2 Time:" /> - <metamer:clientTime id="beginTime" label="Begin Time:" /> - <metamer:clientTime id="completeTime" label="Complete Time:" /> + <metamer:clientTimeWatcher id="timeWatcher" events="2" /> </h:panelGrid> </ui:define> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/formQueue.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/formQueue.xhtml 2010-11-16 17:02:12 UTC (rev 20059) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/formQueue.xhtml 2010-11-16 17:04:02 UTC (rev 20060) @@ -83,16 +83,16 @@ <h:panelGrid columns="2"> <h:outputText value="Event 1:" /> - <h:inputText id="input1" value="#{a4jQueueBean.text}" onkeypress="add(#{rich:element('events1')}); refresh(#{rich:element('eventTime1:outputTime')}); " + <h:inputText id="input1" value="#{a4jQueueBean.text}" onkeypress="add(#{rich:element('events1')}); #{rich:element('timeWatcher:grid')}.event(1); " disabled="#{not (facesContext.maximumSeverity==null)}"> - <a4j:ajax event="keypress" onbegin="add(#{rich:element('requests')}); refresh(#{rich:element('beginTime:outputTime')}); " render="outtext" - oncomplete="refresh(#{rich:element('completeTime:outputTime')});" onbeforedomupdate="add(#{rich:element('updates')}); " /> + <a4j:ajax event="keypress" onbegin="add(#{rich:element('requests')}); #{rich:element('timeWatcher:grid')}.begin(); " render="outtext" + oncomplete="#{rich:element('timeWatcher:grid')}.complete(); #{rich:element('timeWatcher:grid')}.difference();" onbeforedomupdate="add(#{rich:element('updates')}); " /> </h:inputText> <h:outputText value="Event 2:" /> - <h:inputText id="input2" value="#{a4jQueueBean.text}" onkeypress="add(#{rich:element('events2')}); refresh(#{rich:element('eventTime2:outputTime')}); " + <h:inputText id="input2" value="#{a4jQueueBean.text}" onkeypress="add(#{rich:element('events2')}); #{rich:element('timeWatcher:grid')}.event(2) " disabled="#{not (facesContext.maximumSeverity==null)}"> - <a4j:ajax event="keypress" onbegin="add(#{rich:element('requests')}); refresh(#{rich:element('beginTime:outputTime')}); " render="outtext" - oncomplete="refresh(#{rich:element('completeTime:outputTime')});" onbeforedomupdate="add(#{rich:element('updates')}); " /> + <a4j:ajax event="keypress" onbegin="add(#{rich:element('requests')}); #{rich:element('timeWatcher:grid')}.begin(); " render="outtext" + oncomplete="#{rich:element('timeWatcher:grid')}.complete(); #{rich:element('timeWatcher:grid')}.difference();" onbeforedomupdate="add(#{rich:element('updates')}); " /> </h:inputText> @@ -109,12 +109,8 @@ </h:panelGrid> - <h:panelGrid columns="1"> - <metamer:clientTime id="eventTime1" label="Event 1 Time:" /> - <metamer:clientTime id="eventTime2" label="Event 2 Time:" /> - <metamer:clientTime id="beginTime" label="Begin Time:" /> - <metamer:clientTime id="completeTime" label="Complete Time:" /> - </h:panelGrid> + <metamer:clientTimeWatcher id="timeWatcher" events="2" /> + </h:form> </rich:panel> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/globalQueue.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/globalQueue.xhtml 2010-11-16 17:02:12 UTC (rev 20059) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/globalQueue.xhtml 2010-11-16 17:04:02 UTC (rev 20060) @@ -65,9 +65,9 @@ <h:form id="form" name="queueTestForm"> <h:panelGrid columns="2"> <h:outputText value="Type here:" /> - <h:inputText id="input1" value="#{a4jQueueBean.text}" onkeypress="add(#{rich:element('events1')}); refresh(#{rich:element('eventTime1:outputTime')}); " + <h:inputText id="input1" value="#{a4jQueueBean.text}" onkeypress="add(#{rich:element('events1')}); #{rich:element('timeWatcher:grid')}.event(); " disabled="#{not (facesContext.maximumSeverity==null)}"> - <a4j:ajax event="keypress" onbegin="add(#{rich:element('requests')}); refresh(#{rich:element('beginTime:outputTime')}); " render="outtext" oncomplete="refresh(#{rich:element('completeTime:outputTime')}); " + <a4j:ajax event="keypress" onbegin="add(#{rich:element('requests')}); #{rich:element('timeWatcher:grid')}.begin(); " render="outtext" oncomplete="#{rich:element('timeWatcher:grid')}.complete(); #{rich:element('timeWatcher:grid')}.difference(); " onbeforedomupdate="add(#{rich:element('updates')});"/> </h:inputText> @@ -82,11 +82,7 @@ </h:panelGrid> - <h:panelGrid columns="1"> - <metamer:clientTime id="eventTime1" label="Event Time:" /> - <metamer:clientTime id="beginTime" label="Begin Time:" /> - <metamer:clientTime id="completeTime" label="Complete Time:" /> - </h:panelGrid> + <metamer:clientTimeWatcher id="timeWatcher" /> </h:form> Modified: modules/tests/metamer/trunk/application/src/main/webapp/resources/metamer/clientTimeWatcher.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/resources/metamer/clientTimeWatcher.xhtml 2010-11-16 17:02:12 UTC (rev 20059) +++ modules/tests/metamer/trunk/application/src/main/webapp/resources/metamer/clientTimeWatcher.xhtml 2010-11-16 17:04:02 UTC (rev 20060) @@ -51,7 +51,7 @@ grid.difference = function() { var differenceElement = #{rich:element('difference')}; var beginTimeElement = this.getBeginElement(); - var eventTimeId = "#{rich:clientId('event1')}".replace("1", ""); + var eventTimeId = "#{rich:clientId('event1')}".replace(/1$/, ""); Metamer.ClientTime.updateDifference(differenceElement, beginTimeElement, eventTimeId); }