JBoss Rich Faces SVN: r21673 - modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-02-15 12:35:34 -0500 (Tue, 15 Feb 2011)
New Revision: 21673
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/a4jRepeat.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/hGraphicImage.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/hSelectBooleanCheckbox.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/list.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/scroller.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/simple.xhtml
Log:
unnecessary attributes removed from rich:dataGrid samples
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/a4jRepeat.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/a4jRepeat.xhtml 2011-02-15 17:22:05 UTC (rev 21672)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/a4jRepeat.xhtml 2011-02-15 17:35:34 UTC (rev 21673)
@@ -6,7 +6,7 @@
<!--
JBoss, Home of Professional Open Source
-Copyright 2010, Red Hat, Inc. and individual contributors
+Copyright 2010-2011, Red Hat, Inc. and individual contributors
by the @authors tag. See the copyright.txt in the distribution for a
full listing of individual contributors.
@@ -49,17 +49,11 @@
<ui:define name="component">
<rich:dataGrid id="richDataGrid"
- captionFacet="#{richDataGridBean.attributes['captionFacet'].value}"
columns="#{richDataGridBean.attributes['columns'].value}"
elements="#{richDataGridBean.attributes['elements'].value}"
first="#{richDataGridBean.attributes['first'].value}"
- footerFacet="#{richDataGridBean.attributes['footerFacet'].value}"
- headerFacet="#{richDataGridBean.attributes['headerFacet'].value}"
- iterationState="#{richDataGridBean.attributes['iterationState'].value}"
iterationStatusVar="#{richDataGridBean.attributes['iterationStatusVar'].value}"
keepSaved="#{richDataGridBean.attributes['keepSaved'].value}"
- noDataFacet="#{richDataGridBean.attributes['noDataFacet'].value}"
- relativeRowIndex="#{richDataGridBean.attributes['relativeRowIndex'].value}"
rendered="#{richDataGridBean.attributes['rendered'].value}"
rowAvailable="#{richDataGridBean.attributes['rowAvailable'].value}"
rowCount="#{richDataGridBean.attributes['rowCount'].value}"
@@ -67,7 +61,6 @@
rowIndex="#{richDataGridBean.attributes['rowIndex'].value}"
rowKey="#{richDataGridBean.attributes['rowKey'].value}"
rowKeyConverter="#{richDataGridBean.attributes['rowKeyConverter'].value}"
- rows="#{richDataGridBean.attributes['rows'].value}"
value="#{richDataGridBean.state ? model.employees : null}"
var="record">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/hGraphicImage.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/hGraphicImage.xhtml 2011-02-15 17:22:05 UTC (rev 21672)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/hGraphicImage.xhtml 2011-02-15 17:35:34 UTC (rev 21673)
@@ -6,7 +6,7 @@
<!--
JBoss, Home of Professional Open Source
-Copyright 2010, Red Hat, Inc. and individual contributors
+Copyright 2010-2011, Red Hat, Inc. and individual contributors
by the @authors tag. See the copyright.txt in the distribution for a
full listing of individual contributors.
@@ -49,17 +49,11 @@
<ui:define name="component">
<rich:dataGrid id="richDataGrid"
- captionFacet="#{richDataGridBean.attributes['captionFacet'].value}"
columns="#{richDataGridBean.attributes['columns'].value}"
elements="#{richDataGridBean.attributes['elements'].value}"
first="#{richDataGridBean.attributes['first'].value}"
- footerFacet="#{richDataGridBean.attributes['footerFacet'].value}"
- headerFacet="#{richDataGridBean.attributes['headerFacet'].value}"
- iterationState="#{richDataGridBean.attributes['iterationState'].value}"
iterationStatusVar="#{richDataGridBean.attributes['iterationStatusVar'].value}"
keepSaved="#{richDataGridBean.attributes['keepSaved'].value}"
- noDataFacet="#{richDataGridBean.attributes['noDataFacet'].value}"
- relativeRowIndex="#{richDataGridBean.attributes['relativeRowIndex'].value}"
rendered="#{richDataGridBean.attributes['rendered'].value}"
rowAvailable="#{richDataGridBean.attributes['rowAvailable'].value}"
rowCount="#{richDataGridBean.attributes['rowCount'].value}"
@@ -67,7 +61,6 @@
rowIndex="#{richDataGridBean.attributes['rowIndex'].value}"
rowKey="#{richDataGridBean.attributes['rowKey'].value}"
rowKeyConverter="#{richDataGridBean.attributes['rowKeyConverter'].value}"
- rows="#{richDataGridBean.attributes['rows'].value}"
value="#{richDataGridBean.state ? model.employees : null}"
var="record">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/hSelectBooleanCheckbox.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/hSelectBooleanCheckbox.xhtml 2011-02-15 17:22:05 UTC (rev 21672)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/hSelectBooleanCheckbox.xhtml 2011-02-15 17:35:34 UTC (rev 21673)
@@ -6,7 +6,7 @@
<!--
JBoss, Home of Professional Open Source
-Copyright 2010, Red Hat, Inc. and individual contributors
+Copyright 2010-2011, Red Hat, Inc. and individual contributors
by the @authors tag. See the copyright.txt in the distribution for a
full listing of individual contributors.
@@ -49,17 +49,11 @@
<ui:define name="component">
<rich:dataGrid id="richDataGrid"
- captionFacet="#{richDataGridBean.attributes['captionFacet'].value}"
columns="#{richDataGridBean.attributes['columns'].value}"
elements="#{richDataGridBean.attributes['elements'].value}"
first="#{richDataGridBean.attributes['first'].value}"
- footerFacet="#{richDataGridBean.attributes['footerFacet'].value}"
- headerFacet="#{richDataGridBean.attributes['headerFacet'].value}"
- iterationState="#{richDataGridBean.attributes['iterationState'].value}"
iterationStatusVar="#{richDataGridBean.attributes['iterationStatusVar'].value}"
keepSaved="#{richDataGridBean.attributes['keepSaved'].value}"
- noDataFacet="#{richDataGridBean.attributes['noDataFacet'].value}"
- relativeRowIndex="#{richDataGridBean.attributes['relativeRowIndex'].value}"
rendered="#{richDataGridBean.attributes['rendered'].value}"
rowAvailable="#{richDataGridBean.attributes['rowAvailable'].value}"
rowCount="#{richDataGridBean.attributes['rowCount'].value}"
@@ -67,7 +61,6 @@
rowIndex="#{richDataGridBean.attributes['rowIndex'].value}"
rowKey="#{richDataGridBean.attributes['rowKey'].value}"
rowKeyConverter="#{richDataGridBean.attributes['rowKeyConverter'].value}"
- rows="#{richDataGridBean.attributes['rows'].value}"
value="#{richDataGridBean.state ? model.employees : null}"
var="record">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/list.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/list.xhtml 2011-02-15 17:22:05 UTC (rev 21672)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/list.xhtml 2011-02-15 17:35:34 UTC (rev 21673)
@@ -5,7 +5,7 @@
<!--
JBoss, Home of Professional Open Source
-Copyright 2010, Red Hat, Inc. and individual contributors
+Copyright 2010-2011, Red Hat, Inc. and individual contributors
by the @authors tag. See the copyright.txt in the distribution for a
full listing of individual contributors.
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/scroller.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/scroller.xhtml 2011-02-15 17:22:05 UTC (rev 21672)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/scroller.xhtml 2011-02-15 17:35:34 UTC (rev 21673)
@@ -6,7 +6,7 @@
<!--
JBoss, Home of Professional Open Source
-Copyright 2010, Red Hat, Inc. and individual contributors
+Copyright 2010-2011, Red Hat, Inc. and individual contributors
by the @authors tag. See the copyright.txt in the distribution for a
full listing of individual contributors.
@@ -49,17 +49,11 @@
<ui:define name="component">
<rich:dataGrid id="richDataGrid"
- captionFacet="#{richDataGridBean.attributes['captionFacet'].value}"
columns="#{richDataGridBean.attributes['columns'].value}"
elements="#{richDataGridBean.attributes['elements'].value}"
first="#{richDataGridBean.attributes['first'].value}"
- footerFacet="#{richDataGridBean.attributes['footerFacet'].value}"
- headerFacet="#{richDataGridBean.attributes['headerFacet'].value}"
- iterationState="#{richDataGridBean.attributes['iterationState'].value}"
iterationStatusVar="#{richDataGridBean.attributes['iterationStatusVar'].value}"
keepSaved="#{richDataGridBean.attributes['keepSaved'].value}"
- noDataFacet="#{richDataGridBean.attributes['noDataFacet'].value}"
- relativeRowIndex="#{richDataGridBean.attributes['relativeRowIndex'].value}"
rendered="#{richDataGridBean.attributes['rendered'].value}"
rowAvailable="#{richDataGridBean.attributes['rowAvailable'].value}"
rowCount="#{richDataGridBean.attributes['rowCount'].value}"
@@ -67,7 +61,6 @@
rowIndex="#{richDataGridBean.attributes['rowIndex'].value}"
rowKey="#{richDataGridBean.attributes['rowKey'].value}"
rowKeyConverter="#{richDataGridBean.attributes['rowKeyConverter'].value}"
- rows="#{richDataGridBean.attributes['rows'].value}"
value="#{richDataGridBean.state ? model.capitals : null}"
var="record">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/simple.xhtml 2011-02-15 17:22:05 UTC (rev 21672)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/simple.xhtml 2011-02-15 17:35:34 UTC (rev 21673)
@@ -6,7 +6,7 @@
<!--
JBoss, Home of Professional Open Source
-Copyright 2010, Red Hat, Inc. and individual contributors
+Copyright 2010-2011, Red Hat, Inc. and individual contributors
by the @authors tag. See the copyright.txt in the distribution for a
full listing of individual contributors.
@@ -38,20 +38,19 @@
</ui:define>
<ui:define name="component">
- <h:panelGroup layout="div">
- <h:outputText value="Show data in table: " />
- <h:selectBooleanCheckbox id="noDataCheckbox" value="#{richDataGridBean.state}">
- <a4j:ajax render="richDataGrid"/>
- </h:selectBooleanCheckbox>
+ <h:panelGroup layout="div">
+ <h:outputText value="Show data in table: " />
+ <h:selectBooleanCheckbox id="noDataCheckbox" value="#{richDataGridBean.state}">
+ <a4j:ajax render="richDataGrid"/>
+ </h:selectBooleanCheckbox>
</h:panelGroup>
-
+
<rich:dataGrid id="richDataGrid"
columns="#{richDataGridBean.attributes['columns'].value}"
first="#{richDataGridBean.attributes['first'].value}"
elements="#{richDataGridBean.attributes['elements'].value}"
keepSaved="#{richDataGridBean.attributes['keepSaved'].value}"
rendered="#{richDataGridBean.attributes['rendered'].value}"
- rows="#{richDataGridBean.attributes['rows'].value}"
value="#{richDataGridBean.state ? model.capitals : null}"
var="record">
15 years, 2 months
JBoss Rich Faces SVN: r21672 - in modules/tests/metamer/trunk: ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTooltip and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2011-02-15 12:22:05 -0500 (Tue, 15 Feb 2011)
New Revision: 21672
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richTooltip/simple.xhtml
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTooltip/TestTooltipSimple.java
Log:
fixed tooltip request event handlers + removed issue tracking + added test (RF-10476)
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richTooltip/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richTooltip/simple.xhtml 2011-02-15 15:53:47 UTC (rev 21671)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTooltip/simple.xhtml 2011-02-15 17:22:05 UTC (rev 21672)
@@ -79,6 +79,9 @@
onmouseout="#{richTooltipBean.attributes['onmouseout'].value}"
onmouseover="#{richTooltipBean.attributes['onmouseover'].value}"
onmouseup="#{richTooltipBean.attributes['onmouseup'].value}"
+ onbegin="#{richTooltipBean.attributes['onbegin'].value}"
+ onbeforedomupdate="#{richTooltipBean.attributes['onbeforedomupdate'].value}"
+ oncomplete="#{richTooltipBean.attributes['oncomplete'].value}"
onshow="#{richTooltipBean.attributes['onshow'].value}"
render="#{richTooltipBean.attributes['render'].value}"
rendered="#{richTooltipBean.attributes['rendered'].value}"
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTooltip/TestTooltipSimple.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTooltip/TestTooltipSimple.java 2011-02-15 15:53:47 UTC (rev 21671)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTooltip/TestTooltipSimple.java 2011-02-15 17:22:05 UTC (rev 21672)
@@ -120,10 +120,10 @@
}
@Test
- @IssueTracking("https://issues.jboss.org/browse/RF-10476")
public void testData() {
attributes.setData("RichFaces 4");
attributes.setOncomplete("data = event.data");
+ attributes.setMode(TooltipMode.ajax);
retrieveRequestTime.initializeValue();
tooltip.recall();
@@ -133,6 +133,17 @@
}
@Test
+ public void testRequestEventHandlers() {
+ attributes.setMode(TooltipMode.ajax);
+
+ super.testRequestEventsBefore("begin", "beforedomupdate", "complete");
+ retrieveRequestTime.initializeValue();
+ tooltip.recall();
+ waitGui.waitForChange(retrieveRequestTime);
+ super.testRequestEventsAfter("begin", "beforedomupdate", "complete");
+ }
+
+ @Test
public void testDir() {
super.testDir(tooltip);
}
15 years, 2 months
JBoss Rich Faces SVN: r21671 - modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2011-02-15 10:53:47 -0500 (Tue, 15 Feb 2011)
New Revision: 21671
Modified:
modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichAutocompleteBean.properties
modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichDropDownMenuBean.properties
modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichMenuItemBean.properties
Log:
fixed attributes mode for several components
Modified: modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichAutocompleteBean.properties
===================================================================
--- modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichAutocompleteBean.properties 2011-02-15 15:53:11 UTC (rev 21670)
+++ modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichAutocompleteBean.properties 2011-02-15 15:53:47 UTC (rev 21671)
@@ -1,4 +1,4 @@
attr.mode.client=client
attr.mode.ajax=ajax
attr.mode.cachedAjax=cachedAjax
-attr.mode.none=
+attr.mode.null=
Modified: modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichDropDownMenuBean.properties
===================================================================
--- modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichDropDownMenuBean.properties 2011-02-15 15:53:11 UTC (rev 21670)
+++ modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichDropDownMenuBean.properties 2011-02-15 15:53:47 UTC (rev 21671)
@@ -23,3 +23,8 @@
attr.jointPoint.bottomAuto=bottomAuto
attr.jointPoint.auto=auto
attr.jointPoint.null=
+
+attr.mode.client=client
+attr.mode.ajax=ajax
+attr.mode.server=server
+attr.mode.null=
\ No newline at end of file
Modified: modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichMenuItemBean.properties
===================================================================
--- modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichMenuItemBean.properties 2011-02-15 15:53:11 UTC (rev 21670)
+++ modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichMenuItemBean.properties 2011-02-15 15:53:47 UTC (rev 21671)
@@ -13,3 +13,8 @@
attr.iconDisabled.heart=/resources/images/heart.png
attr.iconDisabled.nonexisting=nonexisting
attr.iconDisabled.null=
+
+attr.mode.client=client
+attr.mode.ajax=ajax
+attr.mode.server=server
+attr.mode.null=
\ No newline at end of file
15 years, 2 months
JBoss Rich Faces SVN: r21670 - modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2011-02-15 10:53:11 -0500 (Tue, 15 Feb 2011)
New Revision: 21670
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/globalQueue.xhtml
Log:
replaced wrong action binding in a4j:queue sample
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 2011-02-15 15:49:06 UTC (rev 21669)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/globalQueue.xhtml 2011-02-15 15:53:11 UTC (rev 21670)
@@ -76,7 +76,7 @@
</h:inputText>
<h:outputText value="Click here:" />
- <h:commandButton id="actionButton" value="Action" action="#{a4jQueueBean.increment}"
+ <h:commandButton id="actionButton" value="Action" action="#{richBean.dummyAction}"
onclick="add(#{rich:element('events1')}); #{rich:element('timeWatcher:grid')}.event();">
<a4j:ajax onbegin="add(#{rich:element('requests')}); #{rich:element('timeWatcher:grid')}.begin(); "
oncomplete="#{rich:element('timeWatcher:grid')}.complete(); #{rich:element('timeWatcher:grid')}.difference(); "
15 years, 2 months
JBoss Rich Faces SVN: r21669 - modules/tests/metamer/trunk/ftest.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-02-15 10:49:06 -0500 (Tue, 15 Feb 2011)
New Revision: 21669
Modified:
modules/tests/metamer/trunk/ftest/pom.xml
Log:
https://issues.jboss.org/browse/RFPL-911
added profile for Tomcat 7
Modified: modules/tests/metamer/trunk/ftest/pom.xml
===================================================================
--- modules/tests/metamer/trunk/ftest/pom.xml 2011-02-15 15:25:48 UTC (rev 21668)
+++ modules/tests/metamer/trunk/ftest/pom.xml 2011-02-15 15:49:06 UTC (rev 21669)
@@ -88,27 +88,27 @@
</properties>
<repositories>
- <repository>
+ <repository>
<id>jboss-qa-releases-repository</id>
<url>http://nexus.qa.jboss.com:8081/nexus/content/repositories/releases</url>
<releases>
- <updatePolicy>never</updatePolicy>
- <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ <enabled>true</enabled>
</releases>
<snapshots>
- <enabled>false</enabled>
- </snapshots>
+ <enabled>false</enabled>
+ </snapshots>
</repository>
<repository>
<id>jboss-qa-snapshots-repository</id>
<url>http://nexus.qa.jboss.com:8081/nexus/content/repositories/snapshots</url>
<releases>
- <enabled>false</enabled>
+ <enabled>false</enabled>
</releases>
<snapshots>
- <updatePolicy>daily</updatePolicy>
- <enabled>true</enabled>
- </snapshots>
+ <updatePolicy>daily</updatePolicy>
+ <enabled>true</enabled>
+ </snapshots>
</repository>
<repository>
<id>jboss-public-repository-group</id>
@@ -217,6 +217,42 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>clean-tomcat7-exploded-war</id>
+ <activation>
+ <property>
+ <name>containerId</name>
+ <value>tomcat7x</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>clean-tomcat-exploded-war</id>
+ <phase>initialize</phase>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <excludeDefaultDirectories>true</excludeDefaultDirectories>
+ <filesets>
+ <fileset>
+ <directory>${container.home}/webapps/${context.deploy.path}</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
<profile>
<id>unpack-test-source</id>
@@ -367,6 +403,30 @@
</properties>
</profile>
<profile>
+ <id>tomcat7x-mojarra</id>
+ <properties>
+ <deployable.classifier>mojarra</deployable.classifier>
+ </properties>
+ </profile>
+ <profile>
+ <id>tomcat7x-mojarra_2_1_0</id>
+ <properties>
+ <deployable.classifier>mojarra_2_1_0</deployable.classifier>
+ </properties>
+ </profile>
+ <profile>
+ <id>tomcat7x-myfaces</id>
+ <properties>
+ <deployable.classifier>myfaces</deployable.classifier>
+ </properties>
+ </profile>
+ <profile>
+ <id>tomcat7x-mojarra-snapshot</id>
+ <properties>
+ <deployable.classifier>mojarra-snapshot</deployable.classifier>
+ </properties>
+ </profile>
+ <profile>
<id>jboss6x-mojarra</id>
<properties>
<deployable.classifier>jee6</deployable.classifier>
15 years, 2 months
JBoss Rich Faces SVN: r21668 - in trunk: ui/core/ui/src/main/resources/META-INF/resources/org.richfaces and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2011-02-15 10:25:48 -0500 (Tue, 15 Feb 2011)
New Revision: 21668
Modified:
trunk/core/impl/src/main/resources/META-INF/resources/richfaces.js
trunk/ui/core/ui/src/main/resources/META-INF/resources/org.richfaces/poll.js
Log:
https://issues.jboss.org/browse/RF-7459 js api implementation
Modified: trunk/core/impl/src/main/resources/META-INF/resources/richfaces.js
===================================================================
--- trunk/core/impl/src/main/resources/META-INF/resources/richfaces.js 2011-02-15 15:04:03 UTC (rev 21667)
+++ trunk/core/impl/src/main/resources/META-INF/resources/richfaces.js 2011-02-15 15:25:48 UTC (rev 21668)
@@ -321,33 +321,6 @@
};
//
- var pollTracker = {};
- richfaces.startPoll = function(options) {
- var pollId = options.pollId;
- var interval = options.interval || 1000;
- var ontimer = options.ontimer;
- richfaces.stopPoll(pollId);
-
- richfaces.setZeroRequestDelay(options);
-
- pollTracker[pollId] = window.setTimeout(function(){
- var pollElement = document.getElementById(pollId);
- try {
- ontimer.call(pollElement || window);
- richfaces.startPoll(options);
- } catch (e) {
- // TODO: handle exception
- }
- },interval);
- };
-
- richfaces.stopPoll = function(id) {
- if(pollTracker[id]){
- window.clearTimeout(pollTracker[id]);
- delete pollTracker[id];
- }
- };
-
var jsfEventsAdapterEventNames = {
event: {
'begin': ['begin'],
Modified: trunk/ui/core/ui/src/main/resources/META-INF/resources/org.richfaces/poll.js
===================================================================
--- trunk/ui/core/ui/src/main/resources/META-INF/resources/org.richfaces/poll.js 2011-02-15 15:04:03 UTC (rev 21667)
+++ trunk/ui/core/ui/src/main/resources/META-INF/resources/org.richfaces/poll.js 2011-02-15 15:25:48 UTC (rev 21668)
@@ -1,7 +1,6 @@
(function($, rf) {
rf.ui = rf.ui || {};
var defaultOptions = {
-
};
rf.ui.Poll = function(componentId, options) {
$super.constructor.call(this, componentId, options);
@@ -17,8 +16,6 @@
if (options.enabled){
this.startPoll();
}
-
-
}
rf.BaseComponent.extend(rf.ui.Poll);
@@ -30,7 +27,6 @@
startPoll: function() {
this.stopPoll();
var poll=this;
- //this.setZeroRequestDelay(options);
rf.ui.pollTracker[poll.id] = window.setTimeout(function() {
try {
poll.ontimer.call(poll.pollElement || window);
15 years, 2 months
JBoss Rich Faces SVN: r21667 - in trunk/ui/core/ui/src/main: resources/META-INF/resources/org.richfaces and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2011-02-15 10:04:03 -0500 (Tue, 15 Feb 2011)
New Revision: 21667
Added:
trunk/ui/core/ui/src/main/resources/META-INF/resources/org.richfaces/poll.js
Modified:
trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/AjaxPollRenderer.java
Log:
https://issues.jboss.org/browse/RF-7459 js api implementation. Migration to base component.
Modified: trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/AjaxPollRenderer.java
===================================================================
--- trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/AjaxPollRenderer.java 2011-02-15 13:09:59 UTC (rev 21666)
+++ trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/AjaxPollRenderer.java 2011-02-15 15:04:03 UTC (rev 21667)
@@ -25,6 +25,7 @@
import java.util.HashMap;
import java.util.Map;
+import javax.faces.application.ResourceDependencies;
import javax.faces.application.ResourceDependency;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -46,15 +47,19 @@
/**
* @author shura
*/
-@ResourceDependency(library = "org.richfaces", name = "ajax.reslib")
+@ResourceDependencies({@ResourceDependency(library = "org.richfaces", name = "ajax.reslib"),
+ @ResourceDependency(library = "org.richfaces", name = "base-component.reslib"),
+ @ResourceDependency(library = "org.richfaces", name = "poll.js")})
@JsfRenderer
public class AjaxPollRenderer extends RendererBase {
public static final String COMPONENT_FAMILY = "org.richfaces.Poll";
public static final String RENDERER_TYPE = "org.richfaces.PollRenderer";
- private static final String AJAX_POLL_FUNCTION = "RichFaces.startPoll";
+ private static final String AJAX_POLL_FUNCTION = "new RichFaces.ui.Poll";
+ private static final String ENABLED = "enabled";
+
private void addComponentToAjaxRender(FacesContext context, UIComponent component) {
PartialViewContext pvc = context.getPartialViewContext();
pvc.getRenderIds().add(component.getClientId(context));
@@ -92,44 +97,42 @@
if (shouldRenderForm) {
String clientId = component.getClientId(context) + RendererUtils.DUMMY_FORM_ID;
utils.encodeBeginForm(context, component, writer, clientId);
+ utils.encodeEndForm(context, writer);
}
+ writer.endElement(rootElementName);
// polling script.
writer.startElement(HtmlConstants.SCRIPT_ELEM, component);
writer.writeAttribute(HtmlConstants.TYPE_ATTR, "text/javascript", null);
- StringBuffer script = new StringBuffer("\n");
- if (poll.isEnabled()) {
- JSFunction function = new JSFunction(AJAX_POLL_FUNCTION);
- Map<String, Object> options = new HashMap<String, Object>();
-
- RenderKitUtils.addToScriptHash(options, "interval", poll.getInterval(), "1000");
- RenderKitUtils.addToScriptHash(options, "pollId", component.getClientId(context));
- HandlersChain handlersChain = new HandlersChain(context, poll);
- handlersChain.addInlineHandlerFromAttribute(AbstractPoll.ON_TIMER);
- handlersChain.addBehaviors(AbstractPoll.TIMER);
- handlersChain.addAjaxSubmitFunction();
+ StringBuffer script = new StringBuffer("");
- String handler = handlersChain.toScript();
+ JSFunction function = new JSFunction(AJAX_POLL_FUNCTION);
+ Map<String, Object> options = new HashMap<String, Object>();
- if (handler != null) {
- JSFunctionDefinition timerHandler = new JSFunctionDefinition(JSReference.EVENT);
- timerHandler.addToBody(handler);
- options.put(AbstractPoll.ON_TIMER, timerHandler);
- }
- function.addParameter(options);
- function.appendScript(script);
- } else {
- script.append("RichFaces.stopPoll('").append(component.getClientId(context)).append("')");
+ RenderKitUtils.addToScriptHash(options, "interval", poll.getInterval(), "1000");
+ //RenderKitUtils.addToScriptHash(options, "pollId", component.getClientId(context));
+ HandlersChain handlersChain = new HandlersChain(context, poll);
+ handlersChain.addInlineHandlerFromAttribute(AbstractPoll.ON_TIMER);
+ handlersChain.addBehaviors(AbstractPoll.TIMER);
+ handlersChain.addAjaxSubmitFunction();
+
+ String handler = handlersChain.toScript();
+
+ if (handler != null) {
+ JSFunctionDefinition timerHandler = new JSFunctionDefinition(JSReference.EVENT);
+ timerHandler.addToBody(handler);
+ options.put(AbstractPoll.ON_TIMER, timerHandler);
}
- script.append(";\n");
- writer.writeText(script.toString(), null);
+ if (poll.isEnabled()) {
+ options.put(ENABLED, true);
+ }
+ function.addParameter(component.getClientId(context));
+ function.addParameter(options);
+ //function.appendScript(script);
+ writer.writeText(function.toScript(), null);
+
writer.endElement(HtmlConstants.SCRIPT_ELEM);
-
- if (shouldRenderForm) {
- utils.encodeEndForm(context, writer);
- }
-
- writer.endElement(rootElementName);
+
}
/*
Added: trunk/ui/core/ui/src/main/resources/META-INF/resources/org.richfaces/poll.js
===================================================================
--- trunk/ui/core/ui/src/main/resources/META-INF/resources/org.richfaces/poll.js (rev 0)
+++ trunk/ui/core/ui/src/main/resources/META-INF/resources/org.richfaces/poll.js 2011-02-15 15:04:03 UTC (rev 21667)
@@ -0,0 +1,67 @@
+(function($, rf) {
+ rf.ui = rf.ui || {};
+ var defaultOptions = {
+
+ };
+ rf.ui.Poll = function(componentId, options) {
+ $super.constructor.call(this, componentId, options);
+ this.id = componentId;
+ this.attachToDom();
+ this.interval = options.interval || 1000;
+ this.ontimer = options.ontimer;
+
+ this.pollElement = rf.getDomElement(this.id);
+
+ rf.ui.pollTracker = rf.ui.pollTracker || {};
+
+ if (options.enabled){
+ this.startPoll();
+ }
+
+
+ }
+
+ rf.BaseComponent.extend(rf.ui.Poll);
+ var $super = rf.ui.Poll.$super;
+ $.extend(rf.ui.Poll.prototype, (function() {
+ return {
+ name: "Poll",
+
+ startPoll: function() {
+ this.stopPoll();
+ var poll=this;
+ //this.setZeroRequestDelay(options);
+ rf.ui.pollTracker[poll.id] = window.setTimeout(function() {
+ try {
+ poll.ontimer.call(poll.pollElement || window);
+ poll.startPoll();
+ } catch (e) {
+ // TODO: handle exception
+ }
+ }, poll.interval);
+ },
+
+ stopPoll : function() {
+ if (rf.ui.pollTracker && rf.ui.pollTracker[this.id]) {
+ window.clearTimeout(rf.ui.pollTracker[this.id]);
+ delete rf.ui.pollTracker[this.id];
+ }
+ },
+
+ setZeroRequestDelay : function(options) {
+ if (typeof options.requestDelay == "undefined") {
+ options.requestDelay = 0;
+ }
+ },
+
+ destroy : function() {
+ this.stopPoll();
+ this.detach(this.id);
+ // call parent's destroy method
+ $super.destroy.call(this);
+ }
+
+ };
+ })());
+
+})(jQuery, RichFaces);
\ No newline at end of file
15 years, 2 months
JBoss Rich Faces SVN: r21666 - trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2011-02-15 08:09:59 -0500 (Tue, 15 Feb 2011)
New Revision: 21666
Modified:
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/togglePanel.js
Log:
https://jira.jboss.org/browse/RF-10449
Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/togglePanel.js
===================================================================
--- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/togglePanel.js 2011-02-15 13:07:58 UTC (rev 21665)
+++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/togglePanel.js 2011-02-15 13:09:59 UTC (rev 21666)
@@ -254,8 +254,8 @@
*/
getItemsNames: function () {
var res = [];
- for (var item in this.items) {
- res.push(this.items[item].getName());
+ for (var i=0; i<this.items.length; i++) {
+ res.push(this.items[i].getName());
}
return res;
@@ -357,9 +357,11 @@
* @private
* */
__getItemIndex : function (itemName) {
- for (var i in this.items) {
- if (!this.items[i].disabled && this.items[i].getName() === itemName) {
- return parseInt(i);
+ var item;
+ for (var i=0; i<this.items.length; i++) {
+ item = this.items[i];
+ if (!item.disabled && item.getName() === itemName) {
+ return i;
}
}
15 years, 2 months
JBoss Rich Faces SVN: r21665 - in trunk/examples/richfaces-showcase/src/main: webapp/richfaces/clientValidation/samples and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2011-02-15 08:07:58 -0500 (Tue, 15 Feb 2011)
New Revision: 21665
Modified:
trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/validation/DayStatistics.java
trunk/examples/richfaces-showcase/src/main/webapp/richfaces/clientValidation/samples/jsr303-sample.xhtml
Log:
Minor issues in richfaces-showcase fixed
Modified: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/validation/DayStatistics.java
===================================================================
--- trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/validation/DayStatistics.java 2011-02-15 12:43:41 UTC (rev 21664)
+++ trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/validation/DayStatistics.java 2011-02-15 13:07:58 UTC (rev 21665)
@@ -41,7 +41,7 @@
}
@NotNull
- @Min(value = 1, message = "Please feel at list one entry")
+ @Min(value = 1, message = "Please fill at list one entry")
@Max(value = 24, message = "Only 24h in a day!")
public Integer getTotalTime() {
Integer result = new Integer(0);
Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/clientValidation/samples/jsr303-sample.xhtml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/clientValidation/samples/jsr303-sample.xhtml 2011-02-15 12:43:41 UTC (rev 21664)
+++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/clientValidation/samples/jsr303-sample.xhtml 2011-02-15 13:07:58 UTC (rev 21665)
@@ -12,7 +12,7 @@
<h:outputText value="User information" />
<a4j:status>
<f:facet name="start">
- <h:graphicImage value="/images/ai.gif" style="height:12px;width:12px;"/>
+ <h:graphicImage value="/images/ai.gif" alt="" style="height:12px;width:12px;"/>
</f:facet>
</a4j:status>
</h:panelGroup>
15 years, 2 months
JBoss Rich Faces SVN: r21664 - modules/tests/metamer/trunk/application/src/main/webapp/WEB-INF.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2011-02-15 07:43:41 -0500 (Tue, 15 Feb 2011)
New Revision: 21664
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/WEB-INF/web.xml
Log:
switched accidently commited WAR_BUNDLES_JSF_IMPL=true back to false
Modified: modules/tests/metamer/trunk/application/src/main/webapp/WEB-INF/web.xml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/WEB-INF/web.xml 2011-02-15 11:01:31 UTC (rev 21663)
+++ modules/tests/metamer/trunk/application/src/main/webapp/WEB-INF/web.xml 2011-02-15 12:43:41 UTC (rev 21664)
@@ -14,7 +14,7 @@
</context-param>
<context-param>
<param-name>org.jboss.jbossfaces.WAR_BUNDLES_JSF_IMPL</param-name>
- <param-value>true</param-value>
+ <param-value>false</param-value>
</context-param>
<context-param>
<param-name>org.richfaces.skin</param-name>
15 years, 2 months