JBoss Rich Faces SVN: r19275 - in modules/tests/metamer/trunk: ftest and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2010-09-21 07:48:14 -0400 (Tue, 21 Sep 2010)
New Revision: 19275
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/TimeBean.java
modules/tests/metamer/trunk/ftest/
Log:
* added serialVersionUID to TimeBean
* added nbactions.xml to ftest's svn:ignore
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/TimeBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/TimeBean.java 2010-09-21 11:33:10 UTC (rev 19274)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/TimeBean.java 2010-09-21 11:48:14 UTC (rev 19275)
@@ -39,6 +39,7 @@
@RequestScoped
public class TimeBean implements Serializable {
+ private static final long serialVersionUID = 465994653172568369L;
private Date date;
private String formattedTime;
Property changes on: modules/tests/metamer/trunk/ftest
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
.settings
target
profiles.xml
.pom.xml.swp
+ .classpath
.project
.settings
target
profiles.xml
.pom.xml.swp
nbactions.xml
13 years, 8 months
JBoss Rich Faces SVN: r19274 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2010-09-21 07:33:10 -0400 (Tue, 21 Sep 2010)
New Revision: 19274
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java
Log:
* new implementation of testing JS events
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java 2010-09-21 11:28:55 UTC (rev 19273)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java 2010-09-21 11:33:10 UTC (rev 19274)
@@ -52,6 +52,22 @@
public abstract class AbstractMetamerTest extends AbstractTestCase {
/**
+ * JavaScript condition that verifies that an event was fired, i.e. variable metamerEvents contains event name.
+ */
+ private class EventFiredCondition implements JavaScriptCondition {
+
+ Event event;
+
+ public EventFiredCondition(final Event event) {
+ this.event = event;
+ }
+
+ public JavaScript getJavaScriptCondition() {
+ return new JavaScript("window.metamerEvents.indexOf(\"" + event.getEventName() + "\") != -1");
+ }
+ }
+
+ /**
* timeout in miliseconds
*/
public static final long TIMEOUT = 5000;
@@ -131,21 +147,15 @@
*/
protected void testFireEvent(Event event, ElementLocator<?> element) {
ElementLocator<?> eventInput = pjq("input[id$=on" + event.getEventName() + "Input]");
- final String value = "alert('" + event.getEventName() + "')";
+ String value = "metamerEvents += \"" + event.getEventName() + " \"";
selenium.type(eventInput, value);
selenium.waitForPageToLoad(TIMEOUT);
selenium.fireEvent(element, event);
- waitGui.until(new JavaScriptCondition() {
- public JavaScript getJavaScriptCondition() {
- return new JavaScript("selenium.isAlertPresent()");
- }
- });
-
- assertEquals(selenium.getAlert(), event.getEventName(), event.getEventName()
- + " attribute did not change correctly");
+ waitGui.failWith(event.getEventName() + " attribute did not change correctly").until(
+ new EventFiredCondition(event));
}
/**
13 years, 8 months
JBoss Rich Faces SVN: r19273 - in branches/RF-9151/examples/input-demo/src/main: webapp and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2010-09-21 07:28:55 -0400 (Tue, 21 Sep 2010)
New Revision: 19273
Modified:
branches/RF-9151/examples/input-demo/src/main/java/org/richfaces/demo/InputNumberSliderBean.java
branches/RF-9151/examples/input-demo/src/main/webapp/inputNumberSpinner.xhtml
Log:
RF-9200
Modified: branches/RF-9151/examples/input-demo/src/main/java/org/richfaces/demo/InputNumberSliderBean.java
===================================================================
--- branches/RF-9151/examples/input-demo/src/main/java/org/richfaces/demo/InputNumberSliderBean.java 2010-09-21 11:26:44 UTC (rev 19272)
+++ branches/RF-9151/examples/input-demo/src/main/java/org/richfaces/demo/InputNumberSliderBean.java 2010-09-21 11:28:55 UTC (rev 19273)
@@ -21,6 +21,8 @@
*/
package org.richfaces.demo;
+import java.util.Date;
+
import javax.faces.bean.ManagedBean;
import javax.faces.bean.SessionScoped;
@@ -160,4 +162,8 @@
public int getInputSize() {
return inputSize;
}
+
+ public Date getDate() {
+ return new Date();
+ }
}
Modified: branches/RF-9151/examples/input-demo/src/main/webapp/inputNumberSpinner.xhtml
===================================================================
--- branches/RF-9151/examples/input-demo/src/main/webapp/inputNumberSpinner.xhtml 2010-09-21 11:26:44 UTC (rev 19272)
+++ branches/RF-9151/examples/input-demo/src/main/webapp/inputNumberSpinner.xhtml 2010-09-21 11:28:55 UTC (rev 19273)
@@ -39,12 +39,17 @@
<f:selectItems value="#{skinBean.skins}"/>
</h:selectOneMenu>
<br />
+ <h:outputText value="Date: "/>
+ <h:outputText id="date" value="#{inputNumberSliderBean.date}" />
+ <br />
<ins:inputNumberSpinner id="ins" value="#{inputNumberSliderBean.value}" accesskey="#{inputNumberSliderBean.accesskey}" cycled="#{inputNumberSliderBean.showInput}"
- disabled="#{inputNumberSliderBean.disabled}" enableManualInput="#{inputNumberSliderBean.enableManualInput}"
+ disableBrowserAutoComplete="#{inputNumberSliderBean.showArrows}" disabled="#{inputNumberSliderBean.disabled}" enableManualInput="#{inputNumberSliderBean.enableManualInput}"
inputSize="#{inputNumberSliderBean.inputSize}" maxValue="#{inputNumberSliderBean.maxValue}" minValue="#{inputNumberSliderBean.minValue}"
- step="#{inputNumberSliderBean.step}" />
+ step="#{inputNumberSliderBean.step}">
+ <f:ajax render="date" />
+ </ins:inputNumberSpinner>
<br />
- <h:outputText value="Accesskey: "/>
+ <h:outputText value="Accesskey: " />
<h:inputText value="#{inputNumberSliderBean.accesskey}">
<f:ajax render="ins"/>
</h:inputText>
@@ -54,7 +59,12 @@
<f:ajax render="ins"/>
</h:selectBooleanCheckbox>
<br />
- <h:outputText value="Disabled "/>
+ <h:outputText value="DisableBrowserAutoComplete: "/>
+ <h:selectBooleanCheckbox value="#{inputNumberSliderBean.showArrows}">
+ <f:ajax render="ins"/>
+ </h:selectBooleanCheckbox>
+ <br />
+ <h:outputText value="Disabled: "/>
<h:selectBooleanCheckbox value="#{inputNumberSliderBean.disabled}">
<f:ajax render="ins"/>
</h:selectBooleanCheckbox>
13 years, 8 months
JBoss Rich Faces SVN: r19272 - in branches/RF-9151/ui/input/ui/src/main: templates and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2010-09-21 07:26:44 -0400 (Tue, 21 Sep 2010)
New Revision: 19272
Modified:
branches/RF-9151/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSpinner.ecss
branches/RF-9151/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSpinner.js
branches/RF-9151/ui/input/ui/src/main/templates/inputnumberspinner.template.xml
Log:
RF-9195
Modified: branches/RF-9151/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSpinner.ecss
===================================================================
--- branches/RF-9151/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSpinner.ecss 2010-09-21 11:20:51 UTC (rev 19271)
+++ branches/RF-9151/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSpinner.ecss 2010-09-21 11:26:44 UTC (rev 19272)
@@ -42,7 +42,7 @@
vertical-align: top;
}
-.rf-insp-btna {
+.rf-insp-btns {
background-color: '#{richSkin.headerBackgroundColor}';
background-image: "url(#{resource['org.richfaces.renderkit.html.images.ButtonBackgroundImage']})";
background-position: top left;
@@ -55,7 +55,7 @@
}
-.rf-insp-dbtn, .rf-insp-ibtn, .rf-insp-dbtn-dis, .rf-insp-ibtn-dis {
+.rf-insp-dec, .rf-insp-inc, .rf-insp-dec-dis, .rf-insp-inc-dis {
background-position: 50% 40%;
background-repeat: no-repeat;
display: block;
@@ -63,18 +63,18 @@
width: 15px;
}
-.rf-insp-dbtn {
+.rf-insp-dec {
background-image: url("#{resource['org.richfaces.renderkit.html.images.SpinnerArrowBottom']}");
}
-.rf-insp-ibtn {
+.rf-insp-inc {
background-image: url("#{resource['org.richfaces.renderkit.html.images.SpinnerArrowTop']}");
}
-.rf-insp-dbtn-dis {
+.rf-insp-dec-dis {
background-image: url("#{resource['org.richfaces.renderkit.html.images.SpinnerDisabledArrowBottom']}");
}
-.rf-insp-ibtn-dis {
+.rf-insp-inc-dis {
background-image: url("#{resource['org.richfaces.renderkit.html.images.SpinnerDisabledArrowTop']}");
}
\ No newline at end of file
Modified: branches/RF-9151/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSpinner.js
===================================================================
--- branches/RF-9151/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSpinner.js 2010-09-21 11:20:51 UTC (rev 19271)
+++ branches/RF-9151/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSpinner.js 2010-09-21 11:26:44 UTC (rev 19272)
@@ -38,12 +38,16 @@
this.element = jQuery(this.attachToDom());
this.input = this.element.children(".rf-insp-inp");
- this.__inputHandler();
+ var value = Number(this.input.val());
+ if (isNaN(value)) {
+ value = this.minValue;
+ }
+ this.__setValue(value, null, true);
if (!this.input.attr("disabled")) {
- var buttonsArea = this.element.children(".rf-insp-btna");
- this.decreaseButton = buttonsArea.children(".rf-insp-dbtn");
- this.increaseButton = buttonsArea.children(".rf-insp-ibtn");
+ var buttonsArea = this.element.children(".rf-insp-btns");
+ this.decreaseButton = buttonsArea.children(".rf-insp-dec");
+ this.increaseButton = buttonsArea.children(".rf-insp-inc");
var proxy = jQuery.proxy(this.__inputHandler, this)
this.input.change(proxy);
@@ -60,7 +64,7 @@
if (value < this.minValue && this.cycled) {
value = this.maxValue;
}
- this.setValue(value);
+ this.__setValue(value, event);
},
increase: function (event) {
@@ -68,20 +72,20 @@
if (value > this.maxValue && this.cycled) {
value = this.minValue;
}
- this.setValue(value);
+ this.__setValue(value, event);
},
getValue: function () {
return this.value;
},
- setValue: function (value) {
+ setValue: function (value, event) {
if (!this.input.attr("disabled")) {
this.__setValue(value);
}
},
- __setValue: function (value) {
+ __setValue: function (value, event, skipOnchange) {
if (!isNaN(value)) {
value = Math.round(value / this.step) * this.step; //TODO Add normal support of float values. E.g. '0.3' should be instead of '0.30000000000000004'.
if (value > this.maxValue) {
@@ -92,57 +96,65 @@
if (value != this.value) {
this.input.val(value);
this.value = value;
+ if (this.onchange && !skipOnchange) {
+ this.onchange.call(this.element[0], event);
+ }
}
}
},
- __inputHandler: function () {
+ __inputHandler: function (event) {
var value = Number(this.input.val());
if (isNaN(value)) {
this.input.val(this.value);
} else {
- this.__setValue(value);
+ this.__setValue(value, event);
}
},
__keydownHandler: function (event) {
if (event.keyCode == 40) { //DOWN
- this.decrease();
+ this.decrease(event);
event.preventDefault();
} else if (event.keyCode == 38) { //UP
- this.increase();
+ this.increase(event);
event.preventDefault();
}
},
__decreaseHandler: function (event) {
var component = this;
- component.decrease();
+ component.decrease(event);
this.intervalId = window.setInterval(function() {
- component.decrease();
+ component.decrease(event);
}, this.delay);
- jQuery(document).one("mouseup", true, jQuery.proxy(this.__clearInterval, this));
- this.decreaseButton.css("backgroundPosition", "60% 60%");
+ var proxy = jQuery.proxy(this.__clearInterval, this);
+ this.decreaseButton.bind("mouseup", true, proxy).bind("mouseout", true, proxy)
+ .css("backgroundPosition", "60% 60%");
event.preventDefault();
},
__increaseHandler: function (event) {
var component = this;
- component.increase();
+ component.increase(event);
this.intervalId = window.setInterval(function() {
- component.increase();
+ component.increase(event);
}, this.delay);
- jQuery(document).one("mouseup",jQuery.proxy(this.__clearInterval, this));
- this.increaseButton.css("backgroundPosition", "60% 60%");
+ var proxy = jQuery.proxy(this.__clearInterval, this);
+ this.increaseButton.bind("mouseup", proxy).bind("mouseout", proxy)
+ .css("backgroundPosition", "60% 60%");
event.preventDefault();
},
__clearInterval: function (event) {
window.clearInterval(this.intervalId);
+ console.log('alert');
if (event.data) { // decreaseButton
- this.decreaseButton.css("backgroundPosition", "");
+ this.decreaseButton.css("backgroundPosition", "").unbind("mouseout", this.__clearInterval)
+ .unbind("mouseup", this.__clearInterval);
} else {
- this.increaseButton.css("backgroundPosition", "");
+ this.increaseButton.css("backgroundPosition", "").unbind("mouseout", this.__clearInterval)
+ .unbind("mouseup", this.__clearInterval);
}
}
});
Modified: branches/RF-9151/ui/input/ui/src/main/templates/inputnumberspinner.template.xml
===================================================================
--- branches/RF-9151/ui/input/ui/src/main/templates/inputnumberspinner.template.xml 2010-09-21 11:20:51 UTC (rev 19271)
+++ branches/RF-9151/ui/input/ui/src/main/templates/inputnumberspinner.template.xml 2010-09-21 11:26:44 UTC (rev 19272)
@@ -40,15 +40,21 @@
<span id="#{clientId}" class="rf-insp #{component.attributes['styleClass']}" cdk:passThroughWithExclusions="id class" >
<input name="#{clientId}" type="text"
class="rf-insp-inp #{component.attributes['inputClass']}" value="#{getInputValue(facesContext, component)}"
- cdk:passThrough="accesskey disabled maxlength size:inputSize tabindex" readonly="#{!component.attributes['enableManualInput']}" />
- <span class="rf-insp-btna">
- <span class="rf-insp-ibtn#{component.attributes['disabled'] ? '-dis' : ''}" />
- <span class="rf-insp-dbtn#{component.attributes['disabled'] ? '-dis' : ''}" />
+ cdk:passThrough="accesskey disabled maxlength onblur onfocus onclick:oninputclick ondblclick:ondblinputclick onkeydown:oninputkeydown
+ onkeypress:oninputkeypress onkeyup:oninputkeyup onmousedown:oninputmousedown onmousemove:oninputmousemove onmouseout:oninputmouseout
+ onmouseover:oninputmouseover onmouseup:oninputmouseup onselect size:inputSize tabindex"
+ readonly="#{!component.attributes['enableManualInput']}" autocomplete="#{component.attributes['disableBrowserAutoComplete'] ? 'off' : ''}" />
+ <span class="rf-insp-btns">
+ <span class="rf-insp-inc#{component.attributes['disabled'] ? '-dis' : ''}" cdk:passThrough="onclick:onupclick" />
+ <span class="rf-insp-dec#{component.attributes['disabled'] ? '-dis' : ''}" cdk:passThrough="onclick:ondownclick" />
</span>
+ <!-- TODO Rewrite the next line when the CDK will support normal way to take event handlers from attributes and behaviors. -->
+ <cdk:object name="onchange" type="String" value="#{convertToString(RenderKitUtils.getAttributeAndBehaviorsValue(facesContext, component, RenderKitUtils.attributes().generic('onchange', 'onchange', 'change').first()))}" />
<script type="text/javascript">new RichFaces.ui.InputNumberSpinner('#{clientId}', {
cycled: #{component.attributes['cycled']},
maxValue: #{component.attributes['maxValue']},
minValue: #{component.attributes['minValue']},
+ onchange: #{onchange.length() > 0 ? 'function (event) {' + onchange + '}' : 'null' },
step: #{component.attributes['step']}
});</script>
</span>
13 years, 8 months
JBoss Rich Faces SVN: r19271 - branches/RF-9151/ui/input/ui/src/main/config.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2010-09-21 07:20:51 -0400 (Tue, 21 Sep 2010)
New Revision: 19271
Modified:
branches/RF-9151/ui/input/ui/src/main/config/faces-config.xml
Log:
RF-9194
Modified: branches/RF-9151/ui/input/ui/src/main/config/faces-config.xml
===================================================================
--- branches/RF-9151/ui/input/ui/src/main/config/faces-config.xml 2010-09-21 11:02:45 UTC (rev 19270)
+++ branches/RF-9151/ui/input/ui/src/main/config/faces-config.xml 2010-09-21 11:20:51 UTC (rev 19271)
@@ -303,14 +303,198 @@
</property-extension>
</property>
<property>
- <property-name>step</property-name>
+ <property-name>minValue</property-name>
<property-class>java.lang.String</property-class>
- <default-value>"1"</default-value>
+ <default-value>"0"</default-value>
<property-extension>
<cdk:generate>true</cdk:generate>
</property-extension>
</property>
<property>
+ <property-name>onblur</property-name>
+ <property-class>java.lang.String</property-class>
+ <property-extension>
+ <cdk:generate>true</cdk:generate>
+ <cdk:event-name>blur</cdk:event-name>
+ </property-extension>
+ </property>
+ <property>
+ <property-name>onchange</property-name>
+ <property-class>java.lang.String</property-class>
+ <property-extension>
+ <cdk:generate>true</cdk:generate>
+ <cdk:event-name default="true">change</cdk:event-name>
+ </property-extension>
+ </property>
+ <property>
+ <property-name>onclick</property-name>
+ <property-class>java.lang.String</property-class>
+ <property-extension>
+ <cdk:generate>true</cdk:generate>
+ <cdk:event-name>click</cdk:event-name>
+ </property-extension>
+ </property>
+ <property>
+ <property-name>ondblclick</property-name>
+ <property-class>java.lang.String</property-class>
+ <property-extension>
+ <cdk:generate>true</cdk:generate>
+ <cdk:event-name>dblclick</cdk:event-name>
+ </property-extension>
+ </property>
+ <property>
+ <property-name>ondownclick</property-name>
+ <property-class>java.lang.String</property-class>
+ <property-extension>
+ <cdk:generate>true</cdk:generate>
+ <cdk:event-name>downclick</cdk:event-name>
+ </property-extension>
+ </property>
+ <property>
+ <property-name>onfocus</property-name>
+ <property-class>java.lang.String</property-class>
+ <property-extension>
+ <cdk:generate>true</cdk:generate>
+ <cdk:event-name>focus</cdk:event-name>
+ </property-extension>
+ </property>
+ <property>
+ <property-name>oninputclick</property-name>
+ <property-class>java.lang.String</property-class>
+ <property-extension>
+ <cdk:generate>true</cdk:generate>
+ <cdk:event-name>inputclick</cdk:event-name>
+ </property-extension>
+ </property>
+ <property>
+ <property-name>oninputdblclick</property-name>
+ <property-class>java.lang.String</property-class>
+ <property-extension>
+ <cdk:generate>true</cdk:generate>
+ <cdk:event-name>inputdblclick</cdk:event-name>
+ </property-extension>
+ </property>
+ <property>
+ <property-name>oninputkeydown</property-name>
+ <property-class>java.lang.String</property-class>
+ <property-extension>
+ <cdk:generate>true</cdk:generate>
+ <cdk:event-name>inputkeydown</cdk:event-name>
+ </property-extension>
+ </property>
+ <property>
+ <property-name>oninputkeypress</property-name>
+ <property-class>java.lang.String</property-class>
+ <property-extension>
+ <cdk:generate>true</cdk:generate>
+ <cdk:event-name>inputkeypress</cdk:event-name>
+ </property-extension>
+ </property>
+ <property>
+ <property-name>oninputkeyup</property-name>
+ <property-class>java.lang.String</property-class>
+ <property-extension>
+ <cdk:generate>true</cdk:generate>
+ <cdk:event-name>inputkeyup</cdk:event-name>
+ </property-extension>
+ </property>
+ <property>
+ <property-name>oninputmousedown</property-name>
+ <property-class>java.lang.String</property-class>
+ <property-extension>
+ <cdk:generate>true</cdk:generate>
+ <cdk:event-name>inputmousedown</cdk:event-name>
+ </property-extension>
+ </property>
+ <property>
+ <property-name>oninputmousemove</property-name>
+ <property-class>java.lang.String</property-class>
+ <property-extension>
+ <cdk:generate>true</cdk:generate>
+ <cdk:event-name>inputmousemove</cdk:event-name>
+ </property-extension>
+ </property>
+ <property>
+ <property-name>oninputmouseout</property-name>
+ <property-class>java.lang.String</property-class>
+ <property-extension>
+ <cdk:generate>true</cdk:generate>
+ <cdk:event-name>inputmouseout</cdk:event-name>
+ </property-extension>
+ </property>
+ <property>
+ <property-name>oninputmouseover</property-name>
+ <property-class>java.lang.String</property-class>
+ <property-extension>
+ <cdk:generate>true</cdk:generate>
+ <cdk:event-name>inputmouseover</cdk:event-name>
+ </property-extension>
+ </property>
+ <property>
+ <property-name>oninputmouseup</property-name>
+ <property-class>java.lang.String</property-class>
+ <property-extension>
+ <cdk:generate>true</cdk:generate>
+ <cdk:event-name>inputmouseup</cdk:event-name>
+ </property-extension>
+ </property>
+ <property>
+ <property-name>onmousedown</property-name>
+ <property-class>java.lang.String</property-class>
+ <property-extension>
+ <cdk:generate>true</cdk:generate>
+ <cdk:event-name>mousedown</cdk:event-name>
+ </property-extension>
+ </property>
+ <property>
+ <property-name>onmousemove</property-name>
+ <property-class>java.lang.String</property-class>
+ <property-extension>
+ <cdk:generate>true</cdk:generate>
+ <cdk:event-name>mousemove</cdk:event-name>
+ </property-extension>
+ </property>
+ <property>
+ <property-name>onmouseout</property-name>
+ <property-class>java.lang.String</property-class>
+ <property-extension>
+ <cdk:generate>true</cdk:generate>
+ <cdk:event-name>mouseout</cdk:event-name>
+ </property-extension>
+ </property>
+ <property>
+ <property-name>onmouseover</property-name>
+ <property-class>java.lang.String</property-class>
+ <property-extension>
+ <cdk:generate>true</cdk:generate>
+ <cdk:event-name>mouseover</cdk:event-name>
+ </property-extension>
+ </property>
+ <property>
+ <property-name>onmouseup</property-name>
+ <property-class>java.lang.String</property-class>
+ <property-extension>
+ <cdk:generate>true</cdk:generate>
+ <cdk:event-name>mouseup</cdk:event-name>
+ </property-extension>
+ </property>
+ <property>
+ <property-name>onselect</property-name>
+ <property-class>java.lang.String</property-class>
+ <property-extension>
+ <cdk:generate>true</cdk:generate>
+ <cdk:event-name>select</cdk:event-name>
+ </property-extension>
+ </property>
+ <property>
+ <property-name>onupclick</property-name>
+ <property-class>java.lang.String</property-class>
+ <property-extension>
+ <cdk:generate>true</cdk:generate>
+ <cdk:event-name>upclick</cdk:event-name>
+ </property-extension>
+ </property>
+ <property>
<property-name>style</property-name>
<property-class>java.lang.String</property-class>
<property-extension>
13 years, 8 months
JBoss Rich Faces SVN: r19270 - in modules/tests/metamer/trunk: ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jJSFunction and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2010-09-21 07:02:45 -0400 (Tue, 21 Sep 2010)
New Revision: 19270
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/resources/script/common.js
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jJSFunction/TestJSFunctionSimple.java
Log:
* new variable is added to each page for testing purpose
* new implementation of testing events of a4j:jsFunction
Modified: modules/tests/metamer/trunk/application/src/main/webapp/resources/script/common.js
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/resources/script/common.js 2010-09-21 07:26:59 UTC (rev 19269)
+++ modules/tests/metamer/trunk/application/src/main/webapp/resources/script/common.js 2010-09-21 11:02:45 UTC (rev 19270)
@@ -1,4 +1,11 @@
/**
+ * Variable used in Selenium tests for testing JavaScript events. Each event adds its name to this
+ * variable. E.g. if onbegin, onbeforedomupdate and oncomplete is set, successful result will be
+ * "begin beforedomupdate complete ".
+ */
+metamerEvents = "";
+
+/**
* Hides the attributes of a component, header and footer of the page.
*/
function hideControls() {
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jJSFunction/TestJSFunctionSimple.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jJSFunction/TestJSFunctionSimple.java 2010-09-21 07:26:59 UTC (rev 19269)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jJSFunction/TestJSFunctionSimple.java 2010-09-21 11:02:45 UTC (rev 19270)
@@ -31,9 +31,9 @@
import java.net.URL;
+import org.jboss.test.selenium.dom.Event;
import org.jboss.test.selenium.encapsulated.JavaScript;
import org.jboss.test.selenium.locator.JQueryLocator;
-import org.jboss.test.selenium.waiting.ajax.JavaScriptCondition;
import org.richfaces.tests.metamer.ftest.AbstractMetamerTest;
import org.testng.annotations.Test;
@@ -197,29 +197,24 @@
@Test
public void testEvents() {
- selenium.type(pjq("input[type=text][id$=onbeginInput]"), "alert('begin')");
+ selenium.type(pjq("input[type=text][id$=onbeginInput]"), "metamerEvents += \"begin \"");
selenium.waitForPageToLoad();
- selenium.type(pjq("input[type=text][id$=onbeforedomupdateInput]"), "alert('beforedomupdate')");
+ selenium.type(pjq("input[type=text][id$=onbeforedomupdateInput]"), "metamerEvents += \"beforedomupdate \"");
selenium.waitForPageToLoad();
- selenium.type(pjq("input[type=text][id$=oncompleteInput]"), "alert('complete')");
+ selenium.type(pjq("input[type=text][id$=oncompleteInput]"), "metamerEvents += \"complete \"");
selenium.waitForPageToLoad();
- JavaScriptCondition condition = new JavaScriptCondition() {
- public JavaScript getJavaScriptCondition() {
- return new JavaScript("selenium.isAlertPresent()");
- }
- };
+ selenium.getEval(new JavaScript("window.metamerEvents = \"\";"));
+ String time1Value = selenium.getText(time1);
- guardXhr(selenium).click(link);
+ selenium.fireEvent(link, Event.CLICK);
+ waitGui.failWith("Page was not updated").waitForChange(time1Value, retrieveText.locator(time1));
- waitGui.failWith("First alert was not displayed").until(condition);
- assertEquals(selenium.getAlert(), "begin", "Attribute onbegin does not work");
+ String[] events = selenium.getEval(new JavaScript("window.metamerEvents")).split(" ");
- waitGui.failWith("Second alert was not displayed").until(condition);
- assertEquals(selenium.getAlert(), "beforedomupdate", "Attribute onbeforedomupdate does not work");
-
- waitGui.failWith("Third alert was not displayed").until(condition);
- assertEquals(selenium.getAlert(), "complete", "Attribute oncomplete does not work");
+ assertEquals(events[0], "begin", "Attribute onbegin doesn't work");
+ assertEquals(events[1], "beforedomupdate", "Attribute onbeforedomupdate doesn't work");
+ assertEquals(events[2], "complete", "Attribute oncomplete doesn't work");
}
@Test
13 years, 8 months
JBoss Rich Faces SVN: r19269 - in modules/tests/metamer/trunk/application/src/main/webapp: templates and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2010-09-21 03:26:59 -0400 (Tue, 21 Sep 2010)
New Revision: 19269
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/index.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/list.xhtml
Log:
added button for invalidating session to home page and to list pages
Modified: modules/tests/metamer/trunk/application/src/main/webapp/index.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/index.xhtml 2010-09-21 06:03:16 UTC (rev 19268)
+++ modules/tests/metamer/trunk/application/src/main/webapp/index.xhtml 2010-09-21 07:26:59 UTC (rev 19269)
@@ -32,7 +32,18 @@
</h:head>
<h:body>
- <h1>Metamer: RichFaces Testing Application</h1>
+ <h1 style="float: left">Metamer: RichFaces Testing Application</h1>
+
+ <h:form id="invalidateSessionForm" style="float: right; ">
+ <h:panelGrid columns="1">
+ <h:commandButton id="invalidateSessionButton" action="#{richBean.invalidateSession}"
+ value="Invalidate Session" image="#{resource['images:cancel.png']}" title="Invalidate Session"
+ style="width: 36px;" />
+ </h:panelGrid>
+ </h:form>
+
+ <hr style="width: 1050px; margin-left: 0px; clear: both; " />
+
<h:form id="linksForm">
<h:panelGrid id="components" columns="3" columnClasses="valign-top,valign-top,valign-top">
<h:panelGroup id="a4jComponents" layout="block" style="width: 350px;">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/list.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/list.xhtml 2010-09-21 06:03:16 UTC (rev 19268)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/list.xhtml 2010-09-21 07:26:59 UTC (rev 19269)
@@ -32,17 +32,26 @@
</h:head>
<h:body>
- <h:panelGrid columns="2">
- <h:link id="goHomeLink" outcome="/index">
- <h:graphicImage id="goHomeImage" library="images" name="home.png" title="Go Home" style="width: 36px;"/>
- </h:link>
- <h:panelGroup style="font-size: xx-large; font-weight: bold;">
- <ui:insert name="pageTitle">Insert some page title here</ui:insert>
- </h:panelGroup>
+ <h:panelGrid columns="2" style="float: left; ">
+ <h:link id="goHomeLink" outcome="/index">
+ <h:graphicImage id="goHomeImage" library="images" name="home.png" title="Go Home" style="width: 36px;"/>
+ </h:link>
+
+ <h:panelGroup style="font-size: xx-large; font-weight: bold;">
+ <ui:insert name="pageTitle">Insert some page title here</ui:insert>
+ </h:panelGroup>
</h:panelGrid>
+
+ <h:form id="invalidateSessionForm" style="float: right; ">
+ <h:panelGrid columns="1">
+ <h:commandButton id="invalidateSessionButton" action="#{richBean.invalidateSession}"
+ value="Invalidate Session" image="#{resource['images:cancel.png']}" title="Invalidate Session"
+ style="width: 36px;" />
+ </h:panelGrid>
+ </h:form>
+
+ <hr style="width: 1050px; margin-left: 0px; margin-bottom: 20px; clear: both; " />
- <br/>
-
<h:panelGroup layout="block" styleClass="links">
<ui:insert name="links">Insert some links to pages here</ui:insert>
</h:panelGroup>
13 years, 8 months
JBoss Rich Faces SVN: r19268 - modules/tests/metamer/trunk.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2010-09-21 02:03:16 -0400 (Tue, 21 Sep 2010)
New Revision: 19268
Modified:
modules/tests/metamer/trunk/.gitignore
Log:
added Assert.java to .gitignore
Modified: modules/tests/metamer/trunk/.gitignore
===================================================================
--- modules/tests/metamer/trunk/.gitignore 2010-09-21 06:02:57 UTC (rev 19267)
+++ modules/tests/metamer/trunk/.gitignore 2010-09-21 06:03:16 UTC (rev 19268)
@@ -7,3 +7,4 @@
/nbactions.xml
/faces-config.NavData
/nb-configuration.xml
+/ftest-source/src/main/java/org/testng/Assert.java
13 years, 8 months
JBoss Rich Faces SVN: r19267 - modules/tests/metamer/trunk/application/src/main/webapp/templates.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2010-09-21 02:02:57 -0400 (Tue, 21 Sep 2010)
New Revision: 19267
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable1.xhtml
Log:
fixed the typo - double '='
Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable1.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable1.xhtml 2010-09-20 15:21:11 UTC (rev 19266)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable1.xhtml 2010-09-21 06:02:57 UTC (rev 19267)
@@ -32,7 +32,7 @@
<h:outputText value="JSF Data Table" />
</f:facet>
<h:panelGroup columns="1" rendered="#{item == 'row 1'}">
- <ui:decorate template=="#{templateBean.nextTemplate}.xhtml" />
+ <ui:decorate template="#{templateBean.nextTemplate}.xhtml" />
</h:panelGroup>
<h:outputText value="#{item}" rendered="#{item != 'row 1'}" />
</h:column>
13 years, 8 months
JBoss Rich Faces SVN: r19266 - in modules/tests/metamer/trunk/application/src/main/webapp: templates and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2010-09-20 11:21:11 -0400 (Mon, 20 Sep 2010)
New Revision: 19266
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/index.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat1.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat2.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/blueDiv.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable1.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable2.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/list.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/redDiv.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable1.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable2.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/template.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat1.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat2.xhtml
Log:
replaced ui:include with ui:decorate (MYFACES-2925)
Modified: modules/tests/metamer/trunk/application/src/main/webapp/index.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/index.xhtml 2010-09-20 15:20:19 UTC (rev 19265)
+++ modules/tests/metamer/trunk/application/src/main/webapp/index.xhtml 2010-09-20 15:21:11 UTC (rev 19266)
@@ -60,7 +60,7 @@
</h:panelGroup>
</h:panelGrid>
- <ui:include src="/templates/footer.xhtml" />
+ <ui:decorate template="/templates/footer.xhtml" />
</h:form>
</h:body>
</html>
\ No newline at end of file
Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat1.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat1.xhtml 2010-09-20 15:20:19 UTC (rev 19265)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat1.xhtml 2010-09-20 15:21:11 UTC (rev 19266)
@@ -29,7 +29,7 @@
<ul>
<a4j:repeat value="#{templateBean.dataTableModel}" var="item" id="containerA4JRepeat1">
<li><h:panelGroup columns="1" rendered="#{item == 'row 1'}">
- <ui:include src="#{templateBean.nextTemplate}.xhtml" />
+ <ui:decorate template="#{templateBean.nextTemplate}.xhtml" />
</h:panelGroup>
<h:outputText value="#{item}" rendered="#{item != 'row 1'}" /></li>
</a4j:repeat>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat2.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat2.xhtml 2010-09-20 15:20:19 UTC (rev 19265)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat2.xhtml 2010-09-20 15:21:11 UTC (rev 19266)
@@ -29,7 +29,7 @@
<ul>
<a4j:repeat value="#{templateBean.dataTableModel}" var="item" id="containerA4JRepeat2">
<li><h:panelGroup columns="1" rendered="#{item == 'row 2'}">
- <ui:include src="#{templateBean.nextTemplate}.xhtml" />
+ <ui:decorate template="#{templateBean.nextTemplate}.xhtml" />
</h:panelGroup>
<h:outputText value="#{item}" rendered="#{item != 'row 2'}" /></li>
</a4j:repeat>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/blueDiv.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/blueDiv.xhtml 2010-09-20 15:20:19 UTC (rev 19265)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/blueDiv.xhtml 2010-09-20 15:21:11 UTC (rev 19266)
@@ -25,8 +25,8 @@
<ui:composition>
- <div style="border: 2px blue dotted; padding: 10px; margin-top: 10px; margin-bottom: 10px;"><ui:include
- src="#{templateBean.nextTemplate}.xhtml" /></div>
+ <div style="border: 2px blue dotted; padding: 10px; margin-top: 10px; margin-bottom: 10px;"><ui:decorate
+ template="#{templateBean.nextTemplate}.xhtml" /></div>
</ui:composition>
</html>
\ No newline at end of file
Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable1.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable1.xhtml 2010-09-20 15:20:19 UTC (rev 19265)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable1.xhtml 2010-09-20 15:21:11 UTC (rev 19266)
@@ -32,7 +32,7 @@
<h:outputText value="JSF Data Table" />
</f:facet>
<h:panelGroup columns="1" rendered="#{item == 'row 1'}">
- <ui:include src="#{templateBean.nextTemplate}.xhtml" />
+ <ui:decorate template=="#{templateBean.nextTemplate}.xhtml" />
</h:panelGroup>
<h:outputText value="#{item}" rendered="#{item != 'row 1'}" />
</h:column>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable2.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable2.xhtml 2010-09-20 15:20:19 UTC (rev 19265)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable2.xhtml 2010-09-20 15:21:11 UTC (rev 19266)
@@ -32,7 +32,7 @@
<h:outputText value="JSF Data Table" />
</f:facet>
<h:panelGroup columns="1" rendered="#{item == 'row 2'}">
- <ui:include src="#{templateBean.nextTemplate}.xhtml" />
+ <ui:decorate template="#{templateBean.nextTemplate}.xhtml" />
</h:panelGroup>
<h:outputText value="#{item}" rendered="#{item != 'row 2'}" />
</h:column>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/list.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/list.xhtml 2010-09-20 15:20:19 UTC (rev 19265)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/list.xhtml 2010-09-20 15:21:11 UTC (rev 19266)
@@ -47,6 +47,6 @@
<ui:insert name="links">Insert some links to pages here</ui:insert>
</h:panelGroup>
- <ui:include src="/templates/footer.xhtml" />
+ <ui:decorate template="/templates/footer.xhtml" />
</h:body>
</html>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/redDiv.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/redDiv.xhtml 2010-09-20 15:20:19 UTC (rev 19265)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/redDiv.xhtml 2010-09-20 15:21:11 UTC (rev 19266)
@@ -25,8 +25,8 @@
<ui:composition>
- <div style="border: 2px red solid; padding: 10px; margin-top: 10px; margin-bottom: 10px;"><ui:include
- src="#{templateBean.nextTemplate}.xhtml" /></div>
+ <div style="border: 2px red solid; padding: 10px; margin-top: 10px; margin-bottom: 10px;"><ui:decorate
+ template="#{templateBean.nextTemplate}.xhtml" /></div>
</ui:composition>
</html>
\ No newline at end of file
Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable1.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable1.xhtml 2010-09-20 15:20:19 UTC (rev 19265)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable1.xhtml 2010-09-20 15:21:11 UTC (rev 19266)
@@ -32,7 +32,7 @@
<h:outputText value="Rich Data Table" />
</f:facet>
<h:panelGroup columns="1" rendered="#{item == 'row 1'}">
- <ui:include src="#{templateBean.nextTemplate}.xhtml" />
+ <ui:decorate template="#{templateBean.nextTemplate}.xhtml" />
</h:panelGroup>
<h:outputText value="#{item}" rendered="#{item != 'row 1'}" />
</rich:column>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable2.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable2.xhtml 2010-09-20 15:20:19 UTC (rev 19265)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable2.xhtml 2010-09-20 15:21:11 UTC (rev 19266)
@@ -32,7 +32,7 @@
<h:outputText value="Rich Data Table" />
</f:facet>
<h:panelGroup columns="1" rendered="#{item == 'row 2'}">
- <ui:include src="#{templateBean.nextTemplate}.xhtml" />
+ <ui:decorate template="#{templateBean.nextTemplate}.xhtml" />
</h:panelGroup>
<h:outputText value="#{item}" rendered="#{item != 'row 2'}" />
</rich:column>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/template.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/template.xhtml 2010-09-20 15:20:19 UTC (rev 19265)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/template.xhtml 2010-09-20 15:21:11 UTC (rev 19266)
@@ -34,7 +34,7 @@
</h:head>
<h:body>
- <div class="header"><ui:include src="/templates/header.xhtml" /></div>
+ <div class="header"><ui:decorate template="/templates/header.xhtml" /></div>
<div class="content">
<div class="messages"><h:messages /></div>
@@ -43,14 +43,14 @@
<c:choose>
<c:when test="#{dontRenderForm}">
<div style="margin-bottom: 20px;"><ui:insert name="outOfTemplateBefore" /></div>
- <ui:include src="/templates/#{templateBean.firstTemplate}.xhtml" />
+ <ui:decorate template="/templates/#{templateBean.firstTemplate}.xhtml" />
<div style="margin-top: 20px;"><ui:insert name="outOfTemplateAfter" /></div>
</c:when>
<c:otherwise>
<h:form id="form">
<div style="margin-bottom: 20px;"><ui:insert name="outOfTemplateBefore" /></div>
- <ui:include src="/templates/#{templateBean.firstTemplate}.xhtml" />
+ <ui:decorate template="/templates/#{templateBean.firstTemplate}.xhtml" />
<div style="margin-top: 20px;"><ui:insert name="outOfTemplateAfter" /></div>
</h:form>
</c:otherwise>
@@ -67,7 +67,7 @@
<div class="footer">
<ui:insert name="footer">
- <ui:include src="/templates/footer.xhtml" />
+ <ui:decorate template="/templates/footer.xhtml" />
</ui:insert>
</div>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat1.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat1.xhtml 2010-09-20 15:20:19 UTC (rev 19265)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat1.xhtml 2010-09-20 15:21:11 UTC (rev 19266)
@@ -29,7 +29,7 @@
<ol>
<ui:repeat value="#{templateBean.dataTableModel}" var="item" id="containerUiRepeat1">
<li><h:panelGroup columns="1" rendered="#{item == 'row 1'}">
- <ui:include src="#{templateBean.nextTemplate}.xhtml" />
+ <ui:decorate template="#{templateBean.nextTemplate}.xhtml" />
</h:panelGroup>
<h:outputText value="#{item}" rendered="#{item != 'row 1'}" /></li>
</ui:repeat>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat2.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat2.xhtml 2010-09-20 15:20:19 UTC (rev 19265)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat2.xhtml 2010-09-20 15:21:11 UTC (rev 19266)
@@ -29,7 +29,7 @@
<ol>
<ui:repeat value="#{templateBean.dataTableModel}" var="item" id="containerUiRepeat2">
<li><h:panelGroup columns="1" rendered="#{item == 'row 2'}">
- <ui:include src="#{templateBean.nextTemplate}.xhtml" />
+ <ui:decorate template="#{templateBean.nextTemplate}.xhtml" />
</h:panelGroup>
<h:outputText value="#{item}" rendered="#{item != 'row 2'}" /></li>
</ui:repeat>
13 years, 8 months