JBoss Rich Faces SVN: r21335 - trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces.
by richfaces-svn-commits@lists.jboss.org
Author: pyaschenko
Date: 2011-01-31 11:55:43 -0500 (Mon, 31 Jan 2011)
New Revision: 21335
Modified:
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceBase.js
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.js
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.js
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputBase.js
Log:
http://jira.jboss.com/jira/browse/RF-10342
Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceBase.js
===================================================================
--- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceBase.js 2011-01-31 16:41:49 UTC (rev 21334)
+++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceBase.js 2011-01-31 16:55:43 UTC (rev 21335)
@@ -60,7 +60,7 @@
},
save: function() {
- var value = this.getValue()
+ var value = this.__getValue()
if(value.length > 0) {
this.setLabel(value);
} else {
@@ -79,7 +79,7 @@
if(!this.useDefaultLabel) {
text = this.getLabel()
}
- this.setValue(text);
+ this.__setValue(text);
this.isSaved = true;
this.oncancel();
},
Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.js
===================================================================
--- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.js 2011-01-31 16:41:49 UTC (rev 21334)
+++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.js 2011-01-31 16:55:43 UTC (rev 21335)
@@ -7,7 +7,7 @@
$super.constructor.call(this, id, mergedOptions);
this.label = $(document.getElementById(id+"Label"));
var labelText = this.label.text();
- var inputLabel = this.getValue();
+ var inputLabel = this.__getValue();
this.initialValue = (labelText == inputLabel) ? labelText : "";
this.saveOnBlur = mergedOptions.saveOnBlur;
this.showControls = mergedOptions.showControls;
@@ -95,14 +95,14 @@
getLabel: function() {
return this.label.text();
- },
+ },
setLabel: function(value) {
this.label.text(value);
},
isValueChanged: function () {
- return (this.getValue() != this.initialValue);
+ return (this.__getValue() != this.initialValue);
},
onshow: function(){
@@ -116,7 +116,7 @@
onfocus: function(e) {
if(!this.__isFocused()) {
this.__setFocused(true);
- this.focusValue = this.getValue();
+ this.focusValue = this.__getValue();
this.invokeEvent.call(this, "focus", document.getElementById(this.id + 'Input'), e);
}
},
@@ -144,7 +144,7 @@
},
__isValueChanged: function() {
- return (this.focusValue != this.getValue());
+ return (this.focusValue != this.__getValue());
},
__setFocused: function(focused) {
Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.js
===================================================================
--- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.js 2011-01-31 16:41:49 UTC (rev 21334)
+++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.js 2011-01-31 16:55:43 UTC (rev 21335)
@@ -69,7 +69,7 @@
this.scrollElements = rf.Event.bindScrollEventHandlers(this.id, this.__scrollHandler, this);
this.__setInputFocus();
this.__setFocused(true);
- this.focusValue = this.getValue();
+ this.focusValue = this.__getValue();
this.invokeEvent.call(this, "focus", document.getElementById(this.id + 'Input'));
this.__showPopup();
@@ -118,7 +118,7 @@
processItem: function(item) {
var label = this.getItemLabel(item);
- this.setValue(label);
+ this.__setValue(label);
this.__setInputFocus();
this.__hidePopup();
@@ -240,7 +240,23 @@
if(!this.inputWidthDefined) {
this.inputItem.width(this.label.width());
}
- }
+ },
+
+ getValue: function() {
+ return this.selValueInput.val();
+ },
+
+ setValue: function(value) {
+ var item;
+ for (var i=0; i<this.items.length; i++) {
+ item = this.items[i];
+ if (item.value == value) {
+ this.__setValue(item.label);
+ this.save();
+ this.popupList.__selectByIndex(i);
+ }
+ }
+ }
}
})());
Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputBase.js
===================================================================
--- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputBase.js 2011-01-31 16:41:49 UTC (rev 21334)
+++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputBase.js 2011-01-31 16:55:43 UTC (rev 21335)
@@ -55,14 +55,22 @@
this.input.focus();
},
- getValue: function() {
+ __getValue: function() {
return this.input.val();
},
- setValue: function(value){
+ __setValue: function(value){
this.input.val(value);
},
+ getValue: function() {
+ return this.__getValue();
+ },
+
+ setValue: function(value) {
+ this.__setValue(value);
+ },
+
getInput: function() {
return this.input;
},
13 years, 7 months
JBoss Rich Faces SVN: r21334 - in trunk/ui/output/ui/src: test/resources/org/richfaces/renderkit/html and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: abelevich
Date: 2011-01-31 11:41:49 -0500 (Mon, 31 Jan 2011)
New Revision: 21334
Modified:
trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TooltipRenderer.java
trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/tooltip.xmlunit.xml
Log:
RF-10286 rich:tooltip - @zindex doesn't work
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TooltipRenderer.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TooltipRenderer.java 2011-01-31 16:27:30 UTC (rev 21333)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TooltipRenderer.java 2011-01-31 16:41:49 UTC (rev 21334)
@@ -102,7 +102,12 @@
writer.startElement(getMarkupElement(tooltip), component);
writer.writeAttribute(ID_ATTRIBUTE, component.getClientId(context), "clientId");
writer.writeAttribute(CLASS_ATTRIBUTE, getStyleClass(component), null);
- String style = getStyle(component);
+ int zindex = tooltip.getZindex();
+ if (zindex == Integer.MIN_VALUE) {
+ zindex = 1000;
+ }
+ String style = concatStyles("z-index:"+zindex, getStyle(component));
+
if (style != null && style.trim().length() > 0) {
writer.writeAttribute(HtmlConstants.STYLE_ATTRIBUTE, style, null);
}
Modified: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/tooltip.xmlunit.xml
===================================================================
--- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/tooltip.xmlunit.xml 2011-01-31 16:27:30 UTC (rev 21333)
+++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/tooltip.xmlunit.xml 2011-01-31 16:41:49 UTC (rev 21334)
@@ -1,4 +1,4 @@
-<span id="f:tooltip" class="rf-tt">
+<span id="f:tooltip" class="rf-tt" style="z-index:1000">
<span id="f:tooltip:cntr" class="rf-tt-cntr">
<span id="f:tooltip:content" class="rf-tt-cnt"></span>
</span>
13 years, 7 months
JBoss Rich Faces SVN: r21333 - trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2011-01-31 11:27:30 -0500 (Mon, 31 Jan 2011)
New Revision: 21333
Modified:
trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/CommandButtonRendererBase.java
Log:
https://issues.jboss.org/browse/RF-10115
Modified: trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/CommandButtonRendererBase.java
===================================================================
--- trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/CommandButtonRendererBase.java 2011-01-31 15:51:46 UTC (rev 21332)
+++ trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/CommandButtonRendererBase.java 2011-01-31 16:27:30 UTC (rev 21333)
@@ -24,6 +24,7 @@
package org.richfaces.renderkit.html;
import java.io.IOException;
+import java.util.Locale;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -31,6 +32,8 @@
import org.richfaces.renderkit.AjaxCommandRendererBase;
+import com.google.common.base.Strings;
+
/**
* @author Nick Belaevski
*
@@ -54,8 +57,8 @@
writer.writeAttribute("alt", value, "value");
}
} else {
- if (null != type) {
- writer.writeAttribute("type", type.toLowerCase(), "type");
+ if (!Strings.isNullOrEmpty(type)) {
+ writer.writeAttribute("type", type.toLowerCase(Locale.US), "type");
} else {
writer.writeAttribute("type", "submit", "type");
}
13 years, 7 months
JBoss Rich Faces SVN: r21332 - in modules/tests/metamer/trunk/application/src/main: resources/org/richfaces/tests/metamer/bean and 4 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2011-01-31 10:51:46 -0500 (Mon, 31 Jan 2011)
New Revision: 21332
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAutocompleteBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichComponentControlBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataGridBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataScrollerBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataTableBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichExtendedDataTableBean.java
modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichDataScrollerBean.properties
modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichExtendedDataTableBean.properties
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataScroller/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components1.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components2.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/facets.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/filtering.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/scroller.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/sorting-using-column.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/sorting-using-component-control.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components1.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components2.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/facets.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/filtering.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/scroller.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/selection.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-column.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-component-control.xhtml
Log:
attribute cleaning
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAutocompleteBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAutocompleteBean.java 2011-01-31 15:50:13 UTC (rev 21331)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAutocompleteBean.java 2011-01-31 15:51:46 UTC (rev 21332)
@@ -69,22 +69,6 @@
attributes.setAttribute("rendered", true);
attributes.setAttribute("tokens", ", ");
attributes.setAttribute("validatorMessage", "validator message");
-
- attributes.remove("autocompleteMethod");
- attributes.remove("converter");
- attributes.remove("fetchValue");
- attributes.remove("itemConverter");
- attributes.remove("validator");
- attributes.remove("valueChangeListener");
-
- // these are hidden attributes
- attributes.remove("autocompleteList");
- attributes.remove("localValue");
- attributes.remove("localValueSet");
- attributes.remove("submittedValue");
- attributes.remove("valid");
- attributes.remove("validators");
- attributes.remove("valueChangeListeners");
}
public Attributes getAttributes() {
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichComponentControlBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichComponentControlBean.java 2011-01-31 15:50:13 UTC (rev 21331)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichComponentControlBean.java 2011-01-31 15:51:46 UTC (rev 21332)
@@ -26,7 +26,7 @@
import javax.annotation.PostConstruct;
import javax.faces.bean.ManagedBean;
-import javax.faces.bean.SessionScoped;
+import javax.faces.bean.ViewScoped;
import org.richfaces.component.behavior.ComponentControlBehavior;
import org.richfaces.tests.metamer.Attributes;
@@ -40,7 +40,7 @@
* @version $Revision$
*/
@ManagedBean(name = "richComponentControlBean")
-@SessionScoped
+@ViewScoped
public class RichComponentControlBean implements Serializable {
private static final long serialVersionUID = 4476643239809L;
@@ -59,8 +59,8 @@
attributes.setAttribute("operation", "previous");
attributes.setAttribute("target", "scroller");
-
- // TODO has to be tested in another way
+
+ // The 'event' attribute for behavior tag must be a literal
attributes.remove("event");
}
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataGridBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataGridBean.java 2011-01-31 15:50:13 UTC (rev 21331)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataGridBean.java 2011-01-31 15:51:46 UTC (rev 21332)
@@ -25,7 +25,7 @@
import javax.annotation.PostConstruct;
import javax.faces.bean.ManagedBean;
-import javax.faces.bean.SessionScoped;
+import javax.faces.bean.ViewScoped;
import org.richfaces.component.UIDataGrid;
import org.richfaces.tests.metamer.Attributes;
@@ -34,12 +34,12 @@
/**
* Managed bean for rich:dataGrid.
- *
+ *
* @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a>
* @version $Revision$
*/
@ManagedBean(name = "richDataGridBean")
-@SessionScoped
+@ViewScoped
public class RichDataGridBean implements Serializable {
private static final long serialVersionUID = 4814439475400649809L;
@@ -62,22 +62,14 @@
attributes.setAttribute("columns", 3);
attributes.setAttribute("rendered", true);
- // TODO has to be tested in other way
- attributes.remove("componentState");
- attributes.remove("rowKeyVar");
- attributes.remove("rowKeyConverter");
- attributes.remove("stateVar");
+ // attributes defined directly in page
attributes.remove("value");
attributes.remove("var");
- // should be hidden
- attributes.remove("rows");
- attributes.remove("rowAvailable");
- attributes.remove("rowCount");
- attributes.remove("rowData");
- attributes.remove("rowIndex");
- attributes.remove("rowKey");
- attributes.remove("relativeRowIndex");
+ // TODO attributes which needs to be tested in another way
+ attributes.remove("iterationStatusVar");
+ attributes.remove("rowKeyVar");
+ attributes.remove("stateVar");
}
public Attributes getAttributes() {
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataScrollerBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataScrollerBean.java 2011-01-31 15:50:13 UTC (rev 21331)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataScrollerBean.java 2011-01-31 15:51:46 UTC (rev 21332)
@@ -22,10 +22,10 @@
package org.richfaces.tests.metamer.bean;
import java.io.Serializable;
-import javax.annotation.PostConstruct;
+import javax.annotation.PostConstruct;
import javax.faces.bean.ManagedBean;
-import javax.faces.bean.SessionScoped;
+import javax.faces.bean.ViewScoped;
import org.richfaces.component.UIDataScroller;
import org.richfaces.tests.metamer.Attributes;
@@ -39,13 +39,12 @@
* @version $Revision$
*/
@ManagedBean(name = "richDataScrollerBean")
-@SessionScoped
+@ViewScoped
public class RichDataScrollerBean implements Serializable {
private static final long serialVersionUID = 122475400649809L;
private static Logger logger;
private Attributes attributes;
- private int page = 1;
private boolean state = true;
/**
@@ -60,18 +59,16 @@
attributes.setAttribute("boundaryControls", "show");
attributes.setAttribute("fastControls", "show");
+ attributes.setAttribute("stepControls", "show");
attributes.setAttribute("fastStep", 1);
attributes.setAttribute("lastPageMode", "short");
attributes.setAttribute("maxPages", 10);
attributes.setAttribute("rendered", true);
attributes.setAttribute("render", "richDataTable");
+ attributes.setAttribute("page", 1);
+ attributes.setAttribute("renderIfSinglePage", true);
+ attributes.setAttribute("for", "richDataTable");
- // FIXME doesn't work: could not find dataTable for datascroller scroller1
- attributes.remove("for");
-
- // will be tested in another way
- attributes.remove("page");
-
}
public Attributes getAttributes() {
@@ -83,22 +80,6 @@
}
/**
- * Getter for page.
- * @return number of the page to which table is scrolled
- */
- public int getPage() {
- return page;
- }
-
- /**
- * Setter for page.
- * @param page number of the page to which table is scrolled
- */
- public void setPage(int page) {
- this.page = page;
- }
-
- /**
* Getter for state.
* @return true if non-empty data model should be used in table
*/
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataTableBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataTableBean.java 2011-01-31 15:50:13 UTC (rev 21331)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataTableBean.java 2011-01-31 15:51:46 UTC (rev 21332)
@@ -92,35 +92,6 @@
attributes.setAttribute("rendered", true);
attributes.setAttribute("rows", 10);
- // hidden attributes
- attributes.remove("filteringListeners");
- attributes.remove("sortingListeners");
- attributes.remove("filterVar");
- attributes.remove("iterationState");
- attributes.remove("iterationStatusVar");
- attributes.remove("rowAvailable");
- attributes.remove("rowCount");
- attributes.remove("rowData");
- attributes.remove("rowIndex");
- attributes.remove("rowKey");
- attributes.remove("rowKeyConverter");
- attributes.remove("relativeRowIndex");
-
- // TODO these must be tested in other way
- attributes.remove("componentState");
- attributes.remove("rowKeyVar");
- attributes.remove("stateVar");
- attributes.remove("selection");
- attributes.remove("var");
- attributes.remove("value");
- attributes.remove("keepSaved");
-
- // TODO can be these set as attributes or only as facets?
- attributes.remove("caption");
- attributes.remove("header");
- attributes.remove("footer");
- attributes.remove("noData");
-
// facets initial values
facets.put("noData", "There is no data.");
facets.put("caption", "Caption");
@@ -129,6 +100,16 @@
facets.put("columnStateFooter", "State Footer");
facets.put("columnCapitalHeader", "Capital Header");
facets.put("columnCapitalFooter", "Capital Footer");
+
+ // attributes already in page
+ attributes.remove("value");
+ attributes.remove("var");
+
+ // TODO needs to be tested another way
+ attributes.remove("filterVar");
+ attributes.remove("iterationStatusVar");
+ attributes.remove("rowKeyVar");
+ attributes.remove("stateVar");
}
public void setBinding(UIDataTable binding) {
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichExtendedDataTableBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichExtendedDataTableBean.java 2011-01-31 15:50:13 UTC (rev 21331)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichExtendedDataTableBean.java 2011-01-31 15:51:46 UTC (rev 21332)
@@ -96,40 +96,18 @@
attributes.get("selection").setType(TreeSet.class);
attributes.get("selection").setMemberType(Integer.class);
- // hidden attributes
+ // attributes which are already in page
+ attributes.remove("value");
+ attributes.remove("var");
+
+ // TODO attributes which needs to be tested another way
attributes.remove("filterVar");
- attributes.remove("filteringListeners");
- attributes.remove("iterationState");
attributes.remove("iterationStatusVar");
- attributes.remove("relativeRowIndex");
- attributes.remove("rowAvailable");
- attributes.remove("rowCount");
- attributes.remove("rowData");
- attributes.remove("rowIndex");
- attributes.remove("rowIndex");
- attributes.remove("rowKey");
- attributes.remove("rowKeyConverter");
- attributes.remove("sortingListeners");
- attributes.remove("clientFirst");
- attributes.remove("clientRows");
-
- // TODO these must be tested in other way
- attributes.remove("componentState");
attributes.remove("rowKeyVar");
attributes.remove("stateVar");
- attributes.remove("value");
- attributes.remove("var");
- attributes.remove("keepSaved");
- // TODO can be these set as attributes or only as facets?
- attributes.remove("caption");
- attributes.remove("header");
- attributes.remove("footer");
- attributes.remove("noData");
-
// facets initial values
facets.put("noData", "There is no data.");
- facets.put("caption", "Caption");
facets.put("header", "Header");
facets.put("columnStateHeader", "State Header");
facets.put("columnStateFooter", "State Footer");
Modified: modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichDataScrollerBean.properties
===================================================================
--- modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichDataScrollerBean.properties 2011-01-31 15:50:13 UTC (rev 21331)
+++ modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichDataScrollerBean.properties 2011-01-31 15:51:46 UTC (rev 21332)
@@ -7,4 +7,8 @@
attr.fastControls.auto=auto
attr.lastPageMode.full=full
-attr.lastPageMode.short=short
\ No newline at end of file
+attr.lastPageMode.short=short
+
+attr.stepControls.show=show
+attr.stepControls.hide=hide
+attr.stepControls.auto=auto
\ No newline at end of file
Modified: modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichExtendedDataTableBean.properties
===================================================================
--- modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichExtendedDataTableBean.properties 2011-01-31 15:50:13 UTC (rev 21331)
+++ modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichExtendedDataTableBean.properties 2011-01-31 15:51:46 UTC (rev 21332)
@@ -1,2 +1,9 @@
attr.sortMode.single=single
-attr.sortMode.multi=multi
\ No newline at end of file
+attr.sortMode.multi=multi
+attr.sortMode.null=
+
+attr.selectionMode.none=none
+attr.selectionMode.single=single
+attr.selectionMode.multiple=multiple
+attr.selectionMode.multipleKeyboardFree=multipleKeyboardFree
+attr.selectionMode.null=
\ No newline at end of file
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-01-31 15:50:13 UTC (rev 21331)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/simple.xhtml 2011-01-31 15:51:46 UTC (rev 21332)
@@ -46,24 +46,11 @@
</h:panelGroup>
<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}"
+ elements="#{richDataGridBean.attributes['elements'].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}"
- rowData="#{richDataGridBean.attributes['rowData'].value}"
- 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/richDataScroller/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataScroller/simple.xhtml 2011-01-31 15:50:13 UTC (rev 21331)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataScroller/simple.xhtml 2011-01-31 15:51:46 UTC (rev 21332)
@@ -27,6 +27,7 @@
-->
<ui:composition template="/templates/template.xhtml">
+ <ui:param name="componentId" value="richDataTable" />
<ui:define name="head">
<f:metadata>
@@ -46,25 +47,19 @@
</h:selectBooleanCheckbox>
<br/><br/>
<rich:dataScroller id="scroller1"
+ for="#{richDataScrollerBean.attributes['for'].value}"
+
boundaryControls="#{richDataScrollerBean.attributes['boundaryControls'].value}"
- dataTable="#{richDataScrollerBean.attributes['dataTable'].value}"
fastControls="#{richDataScrollerBean.attributes['fastControls'].value}"
- fastForward="#{richDataScrollerBean.attributes['fastForward'].value}"
- fastRewind="#{richDataScrollerBean.attributes['fastRewind'].value}"
fastStep="#{richDataScrollerBean.attributes['fastStep'].value}"
first="#{richDataScrollerBean.attributes['first'].value}"
- for="richDataTable"
- iterationState="#{richDataScrollerBean.attributes['iterationState'].value}"
- last="#{richDataScrollerBean.attributes['last'].value}"
lastPageMode="#{richDataScrollerBean.attributes['lastPageMode'].value}"
- localPageSet="#{richDataScrollerBean.attributes['localPageSet'].value}"
maxPages="#{richDataScrollerBean.attributes['maxPages'].value}"
- page="#{richDataScrollerBean.page}"
- pageCount="#{richDataScrollerBean.attributes['pageCount'].value}"
+ page="#{richDataScrollerBean.attributes['page'].value}"
+ render="#{richDataScrollerBean.attributes['render'].value} #{nestedComponentId}"
+ renderIfSinglePage="#{richDataScrollerBean.attributes['renderIfSinglePage'].value}"
rendered="#{richDataScrollerBean.attributes['rendered'].value}"
- render="#{richDataScrollerBean.attributes['render'].value}"
- rowCount="#{richDataScrollerBean.attributes['rowCount'].value}"
- scrollerListeners="#{richDataScrollerBean.attributes['scrollerListeners'].value}"
+ stepControls="#{richDataScrollerBean.attributes['stepControls'].value}"
/>
</ui:define>
@@ -104,25 +99,18 @@
<f:facet name="footer">
<rich:dataScroller id="scroller2"
+
boundaryControls="#{richDataScrollerBean.attributes['boundaryControls'].value}"
- dataTable="#{richDataScrollerBean.attributes['dataTable'].value}"
fastControls="#{richDataScrollerBean.attributes['fastControls'].value}"
- fastForward="#{richDataScrollerBean.attributes['fastForward'].value}"
- fastRewind="#{richDataScrollerBean.attributes['fastRewind'].value}"
fastStep="#{richDataScrollerBean.attributes['fastStep'].value}"
first="#{richDataScrollerBean.attributes['first'].value}"
- for="richDataTable"
- iterationState="#{richDataScrollerBean.attributes['iterationState'].value}"
- last="#{richDataScrollerBean.attributes['last'].value}"
lastPageMode="#{richDataScrollerBean.attributes['lastPageMode'].value}"
- localPageSet="#{richDataScrollerBean.attributes['localPageSet'].value}"
maxPages="#{richDataScrollerBean.attributes['maxPages'].value}"
- page="#{richDataScrollerBean.page}"
- pageCount="#{richDataScrollerBean.attributes['pageCount'].value}"
+ page="#{richDataScrollerBean.attributes['page'].value}"
+ render="#{richDataScrollerBean.attributes['render'].value} scroller1"
+ renderIfSinglePage="#{richDataScrollerBean.attributes['renderIfSinglePage'].value}"
rendered="#{richDataScrollerBean.attributes['rendered'].value}"
- render="#{richDataScrollerBean.attributes['render'].value}"
- rowCount="#{richDataScrollerBean.attributes['rowCount'].value}"
- scrollerListeners="#{richDataScrollerBean.attributes['scrollerListeners'].value}"
+ stepControls="#{richDataScrollerBean.attributes['stepControls'].value}"
/>
</f:facet>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components1.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components1.xhtml 2011-01-31 15:50:13 UTC (rev 21331)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components1.xhtml 2011-01-31 15:51:46 UTC (rev 21332)
@@ -51,27 +51,24 @@
<ui:define name="component">
<rich:dataTable id="richDataTable"
- filterVar="#{richDataTableBean.attributes['filterVar'].value}"
- filteringListeners="#{richDataTableBean.attributes['filteringListeners'].value}"
+ value="#{richDataTableBean.state ? model.employees : null}"
+ var="record"
+
+ captionClass="#{richDataTableBean.attributes['captionClass'].value}"
+ columnClasses="#{richDataTableBean.attributes['columnClasses'].value}"
+ columns="#{richDataTableBean.attributes['columns'].value}"
first="#{richDataTableBean.attributes['first'].value}"
- iterationState="#{richDataTableBean.attributes['iterationState'].value}"
- iterationStatusVar="#{richDataTableBean.attributes['iterationStatusVar'].value}"
keepSaved="#{richDataTableBean.attributes['keepSaved'].value}"
noDataLabel="#{richDataTableBean.attributes['noDataLabel'].value}"
- relativeRowIndex="#{richDataTableBean.attributes['relativeRowIndex'].value}"
rendered="#{richDataTableBean.attributes['rendered'].value}"
- rowAvailable="#{richDataTableBean.attributes['rowAvailable'].value}"
- rowCount="#{richDataTableBean.attributes['rowCount'].value}"
- rowData="#{richDataTableBean.attributes['rowData'].value}"
- rowIndex="#{richDataTableBean.attributes['rowIndex'].value}"
- rowKey="#{richDataTableBean.attributes['rowKey'].value}"
- rowKeyConverter="#{richDataTableBean.attributes['rowKeyConverter'].value}"
+ rowClass="#{richDataTableBean.attributes['rowClass'].value}"
+ rowClasses="#{richDataTableBean.attributes['rowClasses'].value}"
rows="#{richDataTableBean.attributes['rows'].value}"
+ selection="#{richDataTableBean.attributes['selection'].value}"
sortMode="#{richDataTableBean.attributes['sortMode'].value}"
sortPriority="#{richDataTableBean.attributes['sortPriority'].value}"
- sortingListeners="#{richDataTableBean.attributes['sortingListeners'].value}"
- value="#{richDataTableBean.state ? model.employees : null}"
- var="record"
+ style="#{richDataTableBean.attributes['style'].value}"
+ styleClass="#{richDataTableBean.attributes['styleClass'].value}"
>
<f:facet name="noData">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components2.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components2.xhtml 2011-01-31 15:50:13 UTC (rev 21331)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components2.xhtml 2011-01-31 15:51:46 UTC (rev 21332)
@@ -51,27 +51,24 @@
<ui:define name="component">
<rich:dataTable id="richDataTable"
- filterVar="#{richDataTableBean.attributes['filterVar'].value}"
- filteringListeners="#{richDataTableBean.attributes['filteringListeners'].value}"
+ value="#{richDataTableBean.state ? model.employees : null}"
+ var="record"
+
+ captionClass="#{richDataTableBean.attributes['captionClass'].value}"
+ columnClasses="#{richDataTableBean.attributes['columnClasses'].value}"
+ columns="#{richDataTableBean.attributes['columns'].value}"
first="#{richDataTableBean.attributes['first'].value}"
- iterationState="#{richDataTableBean.attributes['iterationState'].value}"
- iterationStatusVar="#{richDataTableBean.attributes['iterationStatusVar'].value}"
keepSaved="#{richDataTableBean.attributes['keepSaved'].value}"
noDataLabel="#{richDataTableBean.attributes['noDataLabel'].value}"
- relativeRowIndex="#{richDataTableBean.attributes['relativeRowIndex'].value}"
rendered="#{richDataTableBean.attributes['rendered'].value}"
- rowAvailable="#{richDataTableBean.attributes['rowAvailable'].value}"
- rowCount="#{richDataTableBean.attributes['rowCount'].value}"
- rowData="#{richDataTableBean.attributes['rowData'].value}"
- rowIndex="#{richDataTableBean.attributes['rowIndex'].value}"
- rowKey="#{richDataTableBean.attributes['rowKey'].value}"
- rowKeyConverter="#{richDataTableBean.attributes['rowKeyConverter'].value}"
+ rowClass="#{richDataTableBean.attributes['rowClass'].value}"
+ rowClasses="#{richDataTableBean.attributes['rowClasses'].value}"
rows="#{richDataTableBean.attributes['rows'].value}"
+ selection="#{richDataTableBean.attributes['selection'].value}"
sortMode="#{richDataTableBean.attributes['sortMode'].value}"
sortPriority="#{richDataTableBean.attributes['sortPriority'].value}"
- sortingListeners="#{richDataTableBean.attributes['sortingListeners'].value}"
- value="#{richDataTableBean.state ? model.employees : null}"
- var="record"
+ style="#{richDataTableBean.attributes['style'].value}"
+ styleClass="#{richDataTableBean.attributes['styleClass'].value}"
>
<f:facet name="noData">
@@ -107,7 +104,7 @@
</f:facet>
<rich:inplaceInput id="nameInput" value="#{record.name}" defaultLabel="Click here to edit">
- <a4j:ajax event="inputchange" render="@this"/>
+ <a4j:ajax event="change" render="@this"/>
</rich:inplaceInput>
<f:facet name="footer">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/facets.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/facets.xhtml 2011-01-31 15:50:13 UTC (rev 21331)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/facets.xhtml 2011-01-31 15:51:46 UTC (rev 21332)
@@ -50,15 +50,24 @@
<ui:define name="component">
<rich:dataTable id="richDataTable"
+ value="#{richDataTableBean.state ? model.capitals : null}"
+ var="record"
+
+ captionClass="#{richDataTableBean.attributes['captionClass'].value}"
+ columnClasses="#{richDataTableBean.attributes['columnClasses'].value}"
+ columns="#{richDataTableBean.attributes['columns'].value}"
first="#{richDataTableBean.attributes['first'].value}"
keepSaved="#{richDataTableBean.attributes['keepSaved'].value}"
noDataLabel="#{richDataTableBean.attributes['noDataLabel'].value}"
rendered="#{richDataTableBean.attributes['rendered'].value}"
+ rowClass="#{richDataTableBean.attributes['rowClass'].value}"
+ rowClasses="#{richDataTableBean.attributes['rowClasses'].value}"
rows="#{richDataTableBean.attributes['rows'].value}"
+ selection="#{richDataTableBean.attributes['selection'].value}"
sortMode="#{richDataTableBean.attributes['sortMode'].value}"
sortPriority="#{richDataTableBean.attributes['sortPriority'].value}"
- value="#{richDataTableBean.state ? model.capitals : null}"
- var="record"
+ style="#{richDataTableBean.attributes['style'].value}"
+ styleClass="#{richDataTableBean.attributes['styleClass'].value}"
>
<f:facet name="noData">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/filtering.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/filtering.xhtml 2011-01-31 15:50:13 UTC (rev 21331)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/filtering.xhtml 2011-01-31 15:51:46 UTC (rev 21332)
@@ -51,15 +51,24 @@
<ui:define name="component">
<rich:dataTable id="richDataTable"
+ value="#{richDataTableBean.state ? model.employees : null}"
+ var="record"
+
+ captionClass="#{richDataTableBean.attributes['captionClass'].value}"
+ columnClasses="#{richDataTableBean.attributes['columnClasses'].value}"
+ columns="#{richDataTableBean.attributes['columns'].value}"
first="#{richDataTableBean.attributes['first'].value}"
keepSaved="#{richDataTableBean.attributes['keepSaved'].value}"
noDataLabel="#{richDataTableBean.attributes['noDataLabel'].value}"
rendered="#{richDataTableBean.attributes['rendered'].value}"
+ rowClass="#{richDataTableBean.attributes['rowClass'].value}"
+ rowClasses="#{richDataTableBean.attributes['rowClasses'].value}"
rows="#{richDataTableBean.attributes['rows'].value}"
+ selection="#{richDataTableBean.attributes['selection'].value}"
sortMode="#{richDataTableBean.attributes['sortMode'].value}"
sortPriority="#{richDataTableBean.attributes['sortPriority'].value}"
- value="#{richDataTableBean.state ? model.employees : null}"
- var="record"
+ style="#{richDataTableBean.attributes['style'].value}"
+ styleClass="#{richDataTableBean.attributes['styleClass'].value}"
>
<f:facet name="noData">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/scroller.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/scroller.xhtml 2011-01-31 15:50:13 UTC (rev 21331)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/scroller.xhtml 2011-01-31 15:51:46 UTC (rev 21332)
@@ -54,27 +54,24 @@
<ui:define name="component">
<rich:dataTable id="richDataTable"
- filterVar="#{richDataTableBean.attributes['filterVar'].value}"
- filteringListeners="#{richDataTableBean.attributes['filteringListeners'].value}"
+ value="#{richDataTableBean.state ? model.capitals : null}"
+ var="record"
+
+ captionClass="#{richDataTableBean.attributes['captionClass'].value}"
+ columnClasses="#{richDataTableBean.attributes['columnClasses'].value}"
+ columns="#{richDataTableBean.attributes['columns'].value}"
first="#{richDataTableBean.attributes['first'].value}"
- iterationState="#{richDataTableBean.attributes['iterationState'].value}"
- iterationStatusVar="#{richDataTableBean.attributes['iterationStatusVar'].value}"
keepSaved="#{richDataTableBean.attributes['keepSaved'].value}"
noDataLabel="#{richDataTableBean.attributes['noDataLabel'].value}"
- relativeRowIndex="#{richDataTableBean.attributes['relativeRowIndex'].value}"
rendered="#{richDataTableBean.attributes['rendered'].value}"
- rowAvailable="#{richDataTableBean.attributes['rowAvailable'].value}"
- rowCount="#{richDataTableBean.attributes['rowCount'].value}"
- rowData="#{richDataTableBean.attributes['rowData'].value}"
- rowIndex="#{richDataTableBean.attributes['rowIndex'].value}"
- rowKey="#{richDataTableBean.attributes['rowKey'].value}"
- rowKeyConverter="#{richDataTableBean.attributes['rowKeyConverter'].value}"
+ rowClass="#{richDataTableBean.attributes['rowClass'].value}"
+ rowClasses="#{richDataTableBean.attributes['rowClasses'].value}"
rows="#{richDataTableBean.attributes['rows'].value}"
+ selection="#{richDataTableBean.attributes['selection'].value}"
sortMode="#{richDataTableBean.attributes['sortMode'].value}"
sortPriority="#{richDataTableBean.attributes['sortPriority'].value}"
- sortingListeners="#{richDataTableBean.attributes['sortingListeners'].value}"
- value="#{richDataTableBean.state ? model.capitals : null}"
- var="record"
+ style="#{richDataTableBean.attributes['style'].value}"
+ styleClass="#{richDataTableBean.attributes['styleClass'].value}"
>
<f:facet name="noData">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/simple.xhtml 2011-01-31 15:50:13 UTC (rev 21331)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/simple.xhtml 2011-01-31 15:51:46 UTC (rev 21332)
@@ -50,15 +50,24 @@
<ui:define name="component">
<rich:dataTable id="richDataTable"
+ value="#{richDataTableBean.state ? model.capitals : null}"
+ var="record"
+
+ captionClass="#{richDataTableBean.attributes['captionClass'].value}"
+ columnClasses="#{richDataTableBean.attributes['columnClasses'].value}"
+ columns="#{richDataTableBean.attributes['columns'].value}"
first="#{richDataTableBean.attributes['first'].value}"
keepSaved="#{richDataTableBean.attributes['keepSaved'].value}"
noDataLabel="#{richDataTableBean.attributes['noDataLabel'].value}"
rendered="#{richDataTableBean.attributes['rendered'].value}"
+ rowClass="#{richDataTableBean.attributes['rowClass'].value}"
+ rowClasses="#{richDataTableBean.attributes['rowClasses'].value}"
rows="#{richDataTableBean.attributes['rows'].value}"
+ selection="#{richDataTableBean.attributes['selection'].value}"
sortMode="#{richDataTableBean.attributes['sortMode'].value}"
sortPriority="#{richDataTableBean.attributes['sortPriority'].value}"
- value="#{richDataTableBean.state ? model.capitals : null}"
- var="record"
+ style="#{richDataTableBean.attributes['style'].value}"
+ styleClass="#{richDataTableBean.attributes['styleClass'].value}"
>
<rich:column id="columnState">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/sorting-using-column.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/sorting-using-column.xhtml 2011-01-31 15:50:13 UTC (rev 21331)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/sorting-using-column.xhtml 2011-01-31 15:51:46 UTC (rev 21332)
@@ -52,15 +52,24 @@
<rich:dataTable id="richDataTable"
binding="#{richDataTableBean.binding}"
+ value="#{richDataTableBean.state ? model.employees : null}"
+ var="record"
+
+ captionClass="#{richDataTableBean.attributes['captionClass'].value}"
+ columnClasses="#{richDataTableBean.attributes['columnClasses'].value}"
+ columns="#{richDataTableBean.attributes['columns'].value}"
first="#{richDataTableBean.attributes['first'].value}"
keepSaved="#{richDataTableBean.attributes['keepSaved'].value}"
noDataLabel="#{richDataTableBean.attributes['noDataLabel'].value}"
rendered="#{richDataTableBean.attributes['rendered'].value}"
+ rowClass="#{richDataTableBean.attributes['rowClass'].value}"
+ rowClasses="#{richDataTableBean.attributes['rowClasses'].value}"
rows="#{richDataTableBean.attributes['rows'].value}"
+ selection="#{richDataTableBean.attributes['selection'].value}"
sortMode="#{richDataTableBean.attributes['sortMode'].value}"
sortPriority="#{richDataTableBean.attributes['sortPriority'].value}"
- value="#{richDataTableBean.state ? model.employees : null}"
- var="record"
+ style="#{richDataTableBean.attributes['style'].value}"
+ styleClass="#{richDataTableBean.attributes['styleClass'].value}"
>
<f:facet name="noData">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/sorting-using-component-control.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/sorting-using-component-control.xhtml 2011-01-31 15:50:13 UTC (rev 21331)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/sorting-using-component-control.xhtml 2011-01-31 15:51:46 UTC (rev 21332)
@@ -51,15 +51,24 @@
<ui:define name="component">
<rich:dataTable id="richDataTable"
+ value="#{richDataTableBean.state ? model.employees : null}"
+ var="record"
+
+ captionClass="#{richDataTableBean.attributes['captionClass'].value}"
+ columnClasses="#{richDataTableBean.attributes['columnClasses'].value}"
+ columns="#{richDataTableBean.attributes['columns'].value}"
first="#{richDataTableBean.attributes['first'].value}"
keepSaved="#{richDataTableBean.attributes['keepSaved'].value}"
noDataLabel="#{richDataTableBean.attributes['noDataLabel'].value}"
rendered="#{richDataTableBean.attributes['rendered'].value}"
+ rowClass="#{richDataTableBean.attributes['rowClass'].value}"
+ rowClasses="#{richDataTableBean.attributes['rowClasses'].value}"
rows="#{richDataTableBean.attributes['rows'].value}"
+ selection="#{richDataTableBean.attributes['selection'].value}"
sortMode="#{richDataTableBean.attributes['sortMode'].value}"
sortPriority="#{richDataTableBean.attributes['sortPriority'].value}"
- value="#{richDataTableBean.state ? model.employees : null}"
- var="record"
+ style="#{richDataTableBean.attributes['style'].value}"
+ styleClass="#{richDataTableBean.attributes['styleClass'].value}"
>
<f:facet name="noData">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components1.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components1.xhtml 2011-01-31 15:50:13 UTC (rev 21331)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components1.xhtml 2011-01-31 15:51:46 UTC (rev 21332)
@@ -98,35 +98,29 @@
<ui:define name="component">
<rich:extendedDataTable id="richEDT"
- beforeselectionchange="#{richExtendedDataTableBean.attributes['beforeselectionchange'].value}"
- clientFirst="#{richExtendedDataTableBean.attributes['clientFirst'].value}"
- clientRows="#{richExtendedDataTableBean.attributes['clientRows'].value}"
- filterVar="#{richExtendedDataTableBean.attributes['filterVar'].value}"
- filteringListeners="#{richExtendedDataTableBean.attributes['filteringListeners'].value}"
+ value="#{richExtendedDataTableBean.state ? model.employees : null}"
+ var="record"
+
+ columnClasses="#{richExtendedDataTableBean.attributes['columnClasses'].value}"
+ columns="#{richExtendedDataTableBean.attributes['columns'].value}"
first="#{richExtendedDataTableBean.attributes['first'].value}"
+ footerClass="#{richExtendedDataTableBean.attributes['footerClass'].value}"
frozenColumns="#{richExtendedDataTableBean.attributes['frozenColumns'].value}"
- iterationState="#{richExtendedDataTableBean.attributes['iterationState'].value}"
- iterationStatusVar="#{richExtendedDataTableBean.attributes['iterationStatusVar'].value}"
+ headerClass="#{richExtendedDataTableBean.attributes['headerClass'].value}"
keepSaved="#{richExtendedDataTableBean.attributes['keepSaved'].value}"
noDataLabel="#{richExtendedDataTableBean.attributes['noDataLabel'].value}"
- relativeRowIndex="#{richExtendedDataTableBean.attributes['relativeRowIndex'].value}"
+ onbeforeselectionchange="#{richExtendedDataTableBean.attributes['onbeforeselectionchange'].value}"
+ onselectionchange="#{richExtendedDataTableBean.attributes['onselectionchange'].value}"
rendered="#{richExtendedDataTableBean.attributes['rendered'].value}"
- rowAvailable="#{richExtendedDataTableBean.attributes['rowAvailable'].value}"
- rowCount="#{richExtendedDataTableBean.attributes['rowCount'].value}"
- rowData="#{richExtendedDataTableBean.attributes['rowData'].value}"
- rowIndex="#{richExtendedDataTableBean.attributes['rowIndex'].value}"
- rowKey="#{richExtendedDataTableBean.attributes['rowKey'].value}"
- rowKeyConverter="#{richExtendedDataTableBean.attributes['rowKeyConverter'].value}"
+ rowClass="#{richExtendedDataTableBean.attributes['rowClass'].value}"
+ rowClasses="#{richExtendedDataTableBean.attributes['rowClasses'].value}"
rows="#{richExtendedDataTableBean.attributes['rows'].value}"
selection="#{richExtendedDataTableBean.attributes['selection'].value}"
- selectionchange="#{richExtendedDataTableBean.attributes['selectionchange'].value}"
+ selectionMode="#{richExtendedDataTableBean.attributes['selectionMode'].value}"
sortMode="#{richExtendedDataTableBean.attributes['sortMode'].value}"
sortPriority="#{richExtendedDataTableBean.attributes['sortPriority'].value}"
- sortingListeners="#{richExtendedDataTableBean.attributes['sortingListeners'].value}"
style="#{richExtendedDataTableBean.attributes['style'].value}"
styleClass="#{richExtendedDataTableBean.attributes['styleClass'].value}"
- value="#{richExtendedDataTableBean.state ? model.employees : null}"
- var="record"
>
<f:facet name="noData">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components2.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components2.xhtml 2011-01-31 15:50:13 UTC (rev 21331)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components2.xhtml 2011-01-31 15:51:46 UTC (rev 21332)
@@ -91,35 +91,29 @@
<ui:define name="component">
<rich:extendedDataTable id="richEDT"
- beforeselectionchange="#{richExtendedDataTableBean.attributes['beforeselectionchange'].value}"
- clientFirst="#{richExtendedDataTableBean.attributes['clientFirst'].value}"
- clientRows="#{richExtendedDataTableBean.attributes['clientRows'].value}"
- filterVar="#{richExtendedDataTableBean.attributes['filterVar'].value}"
- filteringListeners="#{richExtendedDataTableBean.attributes['filteringListeners'].value}"
+ value="#{richExtendedDataTableBean.state ? model.employees : null}"
+ var="record"
+
+ columnClasses="#{richExtendedDataTableBean.attributes['columnClasses'].value}"
+ columns="#{richExtendedDataTableBean.attributes['columns'].value}"
first="#{richExtendedDataTableBean.attributes['first'].value}"
+ footerClass="#{richExtendedDataTableBean.attributes['footerClass'].value}"
frozenColumns="#{richExtendedDataTableBean.attributes['frozenColumns'].value}"
- iterationState="#{richExtendedDataTableBean.attributes['iterationState'].value}"
- iterationStatusVar="#{richExtendedDataTableBean.attributes['iterationStatusVar'].value}"
+ headerClass="#{richExtendedDataTableBean.attributes['headerClass'].value}"
keepSaved="#{richExtendedDataTableBean.attributes['keepSaved'].value}"
noDataLabel="#{richExtendedDataTableBean.attributes['noDataLabel'].value}"
- relativeRowIndex="#{richExtendedDataTableBean.attributes['relativeRowIndex'].value}"
+ onbeforeselectionchange="#{richExtendedDataTableBean.attributes['onbeforeselectionchange'].value}"
+ onselectionchange="#{richExtendedDataTableBean.attributes['onselectionchange'].value}"
rendered="#{richExtendedDataTableBean.attributes['rendered'].value}"
- rowAvailable="#{richExtendedDataTableBean.attributes['rowAvailable'].value}"
- rowCount="#{richExtendedDataTableBean.attributes['rowCount'].value}"
- rowData="#{richExtendedDataTableBean.attributes['rowData'].value}"
- rowIndex="#{richExtendedDataTableBean.attributes['rowIndex'].value}"
- rowKey="#{richExtendedDataTableBean.attributes['rowKey'].value}"
- rowKeyConverter="#{richExtendedDataTableBean.attributes['rowKeyConverter'].value}"
+ rowClass="#{richExtendedDataTableBean.attributes['rowClass'].value}"
+ rowClasses="#{richExtendedDataTableBean.attributes['rowClasses'].value}"
rows="#{richExtendedDataTableBean.attributes['rows'].value}"
selection="#{richExtendedDataTableBean.attributes['selection'].value}"
- selectionchange="#{richExtendedDataTableBean.attributes['selectionchange'].value}"
+ selectionMode="#{richExtendedDataTableBean.attributes['selectionMode'].value}"
sortMode="#{richExtendedDataTableBean.attributes['sortMode'].value}"
sortPriority="#{richExtendedDataTableBean.attributes['sortPriority'].value}"
- sortingListeners="#{richExtendedDataTableBean.attributes['sortingListeners'].value}"
style="#{richExtendedDataTableBean.attributes['style'].value}"
styleClass="#{richExtendedDataTableBean.attributes['styleClass'].value}"
- value="#{richExtendedDataTableBean.state ? model.employees : null}"
- var="record"
>
<f:facet name="noData">
@@ -155,7 +149,7 @@
</f:facet>
<rich:inplaceInput id="nameInput" value="#{record.name}" defaultLabel="Click here to edit">
- <a4j:ajax event="inputchange" render="@this"/>
+ <a4j:ajax event="change" render="@this"/>
</rich:inplaceInput>
<f:facet name="footer">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/facets.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/facets.xhtml 2011-01-31 15:50:13 UTC (rev 21331)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/facets.xhtml 2011-01-31 15:51:46 UTC (rev 21332)
@@ -55,31 +55,35 @@
<ui:define name="component">
<rich:extendedDataTable id="richEDT"
- beforeselectionchange="#{richExtendedDataTableBean.attributes['beforeselectionchange'].value}"
+ value="#{richExtendedDataTableBean.state ? model.capitals : null}"
+ var="record"
+
+ columnClasses="#{richExtendedDataTableBean.attributes['columnClasses'].value}"
+ columns="#{richExtendedDataTableBean.attributes['columns'].value}"
first="#{richExtendedDataTableBean.attributes['first'].value}"
+ footerClass="#{richExtendedDataTableBean.attributes['footerClass'].value}"
frozenColumns="#{richExtendedDataTableBean.attributes['frozenColumns'].value}"
+ headerClass="#{richExtendedDataTableBean.attributes['headerClass'].value}"
+ keepSaved="#{richExtendedDataTableBean.attributes['keepSaved'].value}"
noDataLabel="#{richExtendedDataTableBean.attributes['noDataLabel'].value}"
+ onbeforeselectionchange="#{richExtendedDataTableBean.attributes['onbeforeselectionchange'].value}"
+ onselectionchange="#{richExtendedDataTableBean.attributes['onselectionchange'].value}"
rendered="#{richExtendedDataTableBean.attributes['rendered'].value}"
+ rowClass="#{richExtendedDataTableBean.attributes['rowClass'].value}"
+ rowClasses="#{richExtendedDataTableBean.attributes['rowClasses'].value}"
rows="#{richExtendedDataTableBean.attributes['rows'].value}"
selection="#{richExtendedDataTableBean.attributes['selection'].value}"
- selectionchange="#{richExtendedDataTableBean.attributes['selectionchange'].value}"
+ selectionMode="#{richExtendedDataTableBean.attributes['selectionMode'].value}"
sortMode="#{richExtendedDataTableBean.attributes['sortMode'].value}"
sortPriority="#{richExtendedDataTableBean.attributes['sortPriority'].value}"
style="#{richExtendedDataTableBean.attributes['style'].value}"
styleClass="#{richExtendedDataTableBean.attributes['styleClass'].value}"
- value="#{richExtendedDataTableBean.state ? model.capitals : null}"
- var="record"
>
<f:facet name="noData">
<h:outputText value="#{richExtendedDataTableBean.facets['noData']}" style="color: red;"/>
</f:facet>
- <f:facet name="caption">
- <h:outputText id="captionFacet" value="#{richExtendedDataTableBean.facets['caption']}"
- rendered="#{not empty richExtendedDataTableBean.facets['caption']}"/>
- </f:facet>
-
<f:facet name="header">
<h:outputText id="header" value="#{richExtendedDataTableBean.facets['header']}"
rendered="#{not empty richExtendedDataTableBean.facets['header']}"/>
@@ -119,9 +123,6 @@
<h:outputLabel value="No Data Facet: " />
<h:inputText id="noDataInput" value="#{richExtendedDataTableBean.facets['noData']}" />
- <h:outputLabel value="Caption Facet: " />
- <h:inputText id="captionInput" value="#{richExtendedDataTableBean.facets['caption']}" />
-
<h:outputLabel value="Header Facet:" />
<h:inputText id="headerInput" value="#{richExtendedDataTableBean.facets['header']}" />
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/filtering.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/filtering.xhtml 2011-01-31 15:50:13 UTC (rev 21331)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/filtering.xhtml 2011-01-31 15:51:46 UTC (rev 21332)
@@ -88,35 +88,29 @@
<ui:define name="component">
<rich:extendedDataTable id="richEDT"
- beforeselectionchange="#{richExtendedDataTableBean.attributes['beforeselectionchange'].value}"
- clientFirst="#{richExtendedDataTableBean.attributes['clientFirst'].value}"
- clientRows="#{richExtendedDataTableBean.attributes['clientRows'].value}"
- filterVar="#{richExtendedDataTableBean.attributes['filterVar'].value}"
- filteringListeners="#{richExtendedDataTableBean.attributes['filteringListeners'].value}"
+ value="#{richExtendedDataTableBean.state ? model.employees : null}"
+ var="record"
+
+ columnClasses="#{richExtendedDataTableBean.attributes['columnClasses'].value}"
+ columns="#{richExtendedDataTableBean.attributes['columns'].value}"
first="#{richExtendedDataTableBean.attributes['first'].value}"
+ footerClass="#{richExtendedDataTableBean.attributes['footerClass'].value}"
frozenColumns="#{richExtendedDataTableBean.attributes['frozenColumns'].value}"
- iterationState="#{richExtendedDataTableBean.attributes['iterationState'].value}"
- iterationStatusVar="#{richExtendedDataTableBean.attributes['iterationStatusVar'].value}"
+ headerClass="#{richExtendedDataTableBean.attributes['headerClass'].value}"
keepSaved="#{richExtendedDataTableBean.attributes['keepSaved'].value}"
noDataLabel="#{richExtendedDataTableBean.attributes['noDataLabel'].value}"
- relativeRowIndex="#{richExtendedDataTableBean.attributes['relativeRowIndex'].value}"
+ onbeforeselectionchange="#{richExtendedDataTableBean.attributes['onbeforeselectionchange'].value}"
+ onselectionchange="#{richExtendedDataTableBean.attributes['onselectionchange'].value}"
rendered="#{richExtendedDataTableBean.attributes['rendered'].value}"
- rowAvailable="#{richExtendedDataTableBean.attributes['rowAvailable'].value}"
- rowCount="#{richExtendedDataTableBean.attributes['rowCount'].value}"
- rowData="#{richExtendedDataTableBean.attributes['rowData'].value}"
- rowIndex="#{richExtendedDataTableBean.attributes['rowIndex'].value}"
- rowKey="#{richExtendedDataTableBean.attributes['rowKey'].value}"
- rowKeyConverter="#{richExtendedDataTableBean.attributes['rowKeyConverter'].value}"
+ rowClass="#{richExtendedDataTableBean.attributes['rowClass'].value}"
+ rowClasses="#{richExtendedDataTableBean.attributes['rowClasses'].value}"
rows="#{richExtendedDataTableBean.attributes['rows'].value}"
selection="#{richExtendedDataTableBean.attributes['selection'].value}"
- selectionchange="#{richExtendedDataTableBean.attributes['selectionchange'].value}"
+ selectionMode="#{richExtendedDataTableBean.attributes['selectionMode'].value}"
sortMode="#{richExtendedDataTableBean.attributes['sortMode'].value}"
sortPriority="#{richExtendedDataTableBean.attributes['sortPriority'].value}"
- sortingListeners="#{richExtendedDataTableBean.attributes['sortingListeners'].value}"
style="#{richExtendedDataTableBean.attributes['style'].value}"
styleClass="#{richExtendedDataTableBean.attributes['styleClass'].value}"
- value="#{richExtendedDataTableBean.state ? model.employees : null}"
- var="record"
>
<f:facet name="noData">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/scroller.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/scroller.xhtml 2011-01-31 15:50:13 UTC (rev 21331)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/scroller.xhtml 2011-01-31 15:51:46 UTC (rev 21332)
@@ -57,20 +57,29 @@
<ui:define name="component">
<rich:extendedDataTable id="richEDT"
- beforeselectionchange="#{richExtendedDataTableBean.attributes['beforeselectionchange'].value}"
+ value="#{richExtendedDataTableBean.state ? model.capitals : null}"
+ var="record"
+
+ columnClasses="#{richExtendedDataTableBean.attributes['columnClasses'].value}"
+ columns="#{richExtendedDataTableBean.attributes['columns'].value}"
first="#{richExtendedDataTableBean.attributes['first'].value}"
+ footerClass="#{richExtendedDataTableBean.attributes['footerClass'].value}"
frozenColumns="#{richExtendedDataTableBean.attributes['frozenColumns'].value}"
+ headerClass="#{richExtendedDataTableBean.attributes['headerClass'].value}"
+ keepSaved="#{richExtendedDataTableBean.attributes['keepSaved'].value}"
noDataLabel="#{richExtendedDataTableBean.attributes['noDataLabel'].value}"
+ onbeforeselectionchange="#{richExtendedDataTableBean.attributes['onbeforeselectionchange'].value}"
+ onselectionchange="#{richExtendedDataTableBean.attributes['onselectionchange'].value}"
rendered="#{richExtendedDataTableBean.attributes['rendered'].value}"
+ rowClass="#{richExtendedDataTableBean.attributes['rowClass'].value}"
+ rowClasses="#{richExtendedDataTableBean.attributes['rowClasses'].value}"
rows="#{richExtendedDataTableBean.attributes['rows'].value}"
selection="#{richExtendedDataTableBean.attributes['selection'].value}"
- selectionchange="#{richExtendedDataTableBean.attributes['selectionchange'].value}"
+ selectionMode="#{richExtendedDataTableBean.attributes['selectionMode'].value}"
sortMode="#{richExtendedDataTableBean.attributes['sortMode'].value}"
sortPriority="#{richExtendedDataTableBean.attributes['sortPriority'].value}"
style="#{richExtendedDataTableBean.attributes['style'].value}"
styleClass="#{richExtendedDataTableBean.attributes['styleClass'].value}"
- value="#{richExtendedDataTableBean.state ? model.capitals : null}"
- var="record"
>
<f:facet name="noData">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/selection.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/selection.xhtml 2011-01-31 15:50:13 UTC (rev 21331)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/selection.xhtml 2011-01-31 15:51:46 UTC (rev 21332)
@@ -63,20 +63,29 @@
<ui:define name="component">
<rich:extendedDataTable id="richEDT"
- beforeselectionchange="#{richExtendedDataTableBean.attributes['beforeselectionchange'].value}"
+ value="#{richExtendedDataTableBean.state ? model.capitals : null}"
+ var="record"
+
+ columnClasses="#{richExtendedDataTableBean.attributes['columnClasses'].value}"
+ columns="#{richExtendedDataTableBean.attributes['columns'].value}"
first="#{richExtendedDataTableBean.attributes['first'].value}"
+ footerClass="#{richExtendedDataTableBean.attributes['footerClass'].value}"
frozenColumns="#{richExtendedDataTableBean.attributes['frozenColumns'].value}"
+ headerClass="#{richExtendedDataTableBean.attributes['headerClass'].value}"
+ keepSaved="#{richExtendedDataTableBean.attributes['keepSaved'].value}"
noDataLabel="#{richExtendedDataTableBean.attributes['noDataLabel'].value}"
+ onbeforeselectionchange="#{richExtendedDataTableBean.attributes['onbeforeselectionchange'].value}"
+ onselectionchange="#{richExtendedDataTableBean.attributes['onselectionchange'].value}"
rendered="#{richExtendedDataTableBean.attributes['rendered'].value}"
+ rowClass="#{richExtendedDataTableBean.attributes['rowClass'].value}"
+ rowClasses="#{richExtendedDataTableBean.attributes['rowClasses'].value}"
rows="#{richExtendedDataTableBean.attributes['rows'].value}"
selection="#{richExtendedDataTableBean.attributes['selection'].value}"
- selectionchange="#{richExtendedDataTableBean.attributes['selectionchange'].value}"
+ selectionMode="#{richExtendedDataTableBean.attributes['selectionMode'].value}"
sortMode="#{richExtendedDataTableBean.attributes['sortMode'].value}"
sortPriority="#{richExtendedDataTableBean.attributes['sortPriority'].value}"
style="#{richExtendedDataTableBean.attributes['style'].value}"
styleClass="#{richExtendedDataTableBean.attributes['styleClass'].value}"
- value="#{richExtendedDataTableBean.state ? model.capitals : null}"
- var="record"
>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/simple.xhtml 2011-01-31 15:50:13 UTC (rev 21331)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/simple.xhtml 2011-01-31 15:51:46 UTC (rev 21332)
@@ -55,20 +55,30 @@
<ui:define name="component">
<rich:extendedDataTable id="richEDT"
- beforeselectionchange="#{richExtendedDataTableBean.attributes['beforeselectionchange'].value}"
+ value="#{richExtendedDataTableBean.state ? model.capitals : null}"
+ var="record"
+
+ columnClasses="#{richExtendedDataTableBean.attributes['columnClasses'].value}"
+ columns="#{richExtendedDataTableBean.attributes['columns'].value}"
first="#{richExtendedDataTableBean.attributes['first'].value}"
+ footerClass="#{richExtendedDataTableBean.attributes['footerClass'].value}"
frozenColumns="#{richExtendedDataTableBean.attributes['frozenColumns'].value}"
+ headerClass="#{richExtendedDataTableBean.attributes['headerClass'].value}"
+ keepSaved="#{richExtendedDataTableBean.attributes['keepSaved'].value}"
noDataLabel="#{richExtendedDataTableBean.attributes['noDataLabel'].value}"
+ onbeforeselectionchange="#{richExtendedDataTableBean.attributes['onbeforeselectionchange'].value}"
+ onselectionchange="#{richExtendedDataTableBean.attributes['onselectionchange'].value}"
rendered="#{richExtendedDataTableBean.attributes['rendered'].value}"
+ rowClass="#{richExtendedDataTableBean.attributes['rowClass'].value}"
+ rowClasses="#{richExtendedDataTableBean.attributes['rowClasses'].value}"
rows="#{richExtendedDataTableBean.attributes['rows'].value}"
selection="#{richExtendedDataTableBean.attributes['selection'].value}"
- selectionchange="#{richExtendedDataTableBean.attributes['selectionchange'].value}"
+ selectionMode="#{richExtendedDataTableBean.attributes['selectionMode'].value}"
sortMode="#{richExtendedDataTableBean.attributes['sortMode'].value}"
sortPriority="#{richExtendedDataTableBean.attributes['sortPriority'].value}"
style="#{richExtendedDataTableBean.attributes['style'].value}"
styleClass="#{richExtendedDataTableBean.attributes['styleClass'].value}"
- value="#{richExtendedDataTableBean.state ? model.capitals : null}"
- var="record"
+
>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-column.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-column.xhtml 2011-01-31 15:50:13 UTC (rev 21331)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-column.xhtml 2011-01-31 15:51:46 UTC (rev 21332)
@@ -90,20 +90,29 @@
<rich:extendedDataTable id="richEDT"
binding="#{richExtendedDataTableBean.binding}"
- beforeselectionchange="#{richExtendedDataTableBean.attributes['beforeselectionchange'].value}"
+ value="#{richExtendedDataTableBean.state ? model.employees : null}"
+ var="record"
+
+ columnClasses="#{richExtendedDataTableBean.attributes['columnClasses'].value}"
+ columns="#{richExtendedDataTableBean.attributes['columns'].value}"
first="#{richExtendedDataTableBean.attributes['first'].value}"
+ footerClass="#{richExtendedDataTableBean.attributes['footerClass'].value}"
frozenColumns="#{richExtendedDataTableBean.attributes['frozenColumns'].value}"
+ headerClass="#{richExtendedDataTableBean.attributes['headerClass'].value}"
+ keepSaved="#{richExtendedDataTableBean.attributes['keepSaved'].value}"
noDataLabel="#{richExtendedDataTableBean.attributes['noDataLabel'].value}"
+ onbeforeselectionchange="#{richExtendedDataTableBean.attributes['onbeforeselectionchange'].value}"
+ onselectionchange="#{richExtendedDataTableBean.attributes['onselectionchange'].value}"
rendered="#{richExtendedDataTableBean.attributes['rendered'].value}"
+ rowClass="#{richExtendedDataTableBean.attributes['rowClass'].value}"
+ rowClasses="#{richExtendedDataTableBean.attributes['rowClasses'].value}"
rows="#{richExtendedDataTableBean.attributes['rows'].value}"
selection="#{richExtendedDataTableBean.attributes['selection'].value}"
- selectionchange="#{richExtendedDataTableBean.attributes['selectionchange'].value}"
+ selectionMode="#{richExtendedDataTableBean.attributes['selectionMode'].value}"
sortMode="#{richExtendedDataTableBean.attributes['sortMode'].value}"
sortPriority="#{richExtendedDataTableBean.attributes['sortPriority'].value}"
style="#{richExtendedDataTableBean.attributes['style'].value}"
styleClass="#{richExtendedDataTableBean.attributes['styleClass'].value}"
- value="#{richExtendedDataTableBean.state ? model.employees : null}"
- var="record"
>
<f:facet name="noData">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-component-control.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-component-control.xhtml 2011-01-31 15:50:13 UTC (rev 21331)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-component-control.xhtml 2011-01-31 15:51:46 UTC (rev 21332)
@@ -90,20 +90,29 @@
<rich:extendedDataTable id="richEDT"
binding="#{richExtendedDataTableBean.binding}"
- beforeselectionchange="#{richExtendedDataTableBean.attributes['beforeselectionchange'].value}"
+ value="#{richExtendedDataTableBean.state ? model.employees : null}"
+ var="record"
+
+ columnClasses="#{richExtendedDataTableBean.attributes['columnClasses'].value}"
+ columns="#{richExtendedDataTableBean.attributes['columns'].value}"
first="#{richExtendedDataTableBean.attributes['first'].value}"
+ footerClass="#{richExtendedDataTableBean.attributes['footerClass'].value}"
frozenColumns="#{richExtendedDataTableBean.attributes['frozenColumns'].value}"
+ headerClass="#{richExtendedDataTableBean.attributes['headerClass'].value}"
+ keepSaved="#{richExtendedDataTableBean.attributes['keepSaved'].value}"
noDataLabel="#{richExtendedDataTableBean.attributes['noDataLabel'].value}"
+ onbeforeselectionchange="#{richExtendedDataTableBean.attributes['onbeforeselectionchange'].value}"
+ onselectionchange="#{richExtendedDataTableBean.attributes['onselectionchange'].value}"
rendered="#{richExtendedDataTableBean.attributes['rendered'].value}"
+ rowClass="#{richExtendedDataTableBean.attributes['rowClass'].value}"
+ rowClasses="#{richExtendedDataTableBean.attributes['rowClasses'].value}"
rows="#{richExtendedDataTableBean.attributes['rows'].value}"
selection="#{richExtendedDataTableBean.attributes['selection'].value}"
- selectionchange="#{richExtendedDataTableBean.attributes['selectionchange'].value}"
+ selectionMode="#{richExtendedDataTableBean.attributes['selectionMode'].value}"
sortMode="#{richExtendedDataTableBean.attributes['sortMode'].value}"
sortPriority="#{richExtendedDataTableBean.attributes['sortPriority'].value}"
style="#{richExtendedDataTableBean.attributes['style'].value}"
styleClass="#{richExtendedDataTableBean.attributes['styleClass'].value}"
- value="#{richExtendedDataTableBean.state ? model.employees : null}"
- var="record"
>
<f:facet name="noData">
13 years, 7 months
JBoss Rich Faces SVN: r21331 - in modules/tests/metamer/trunk/application/src/main: webapp/components/a4jAttachQueue and 1 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2011-01-31 10:50:13 -0500 (Mon, 31 Jan 2011)
New Revision: 21331
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JAttachQueueBean.java
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
Log:
a4j:queue/attachQueue - attributes review
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JAttachQueueBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JAttachQueueBean.java 2011-01-31 15:34:52 UTC (rev 21330)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JAttachQueueBean.java 2011-01-31 15:50:13 UTC (rev 21331)
@@ -69,16 +69,6 @@
private void initializeAttributes(Attributes attributes) {
attributes.setAttribute("rendered", true);
-
- // hidden attributes
- attributes.remove("queueId");
-
- // not implemented yet
- // TODO RFPL-734
- attributes.remove("name");
- attributes.remove("timeout");
- attributes.remove("requestGroupingId");
- attributes.remove("ignoreDupResponses");
}
public Attributes getAttributes() {
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 2011-01-31 15:34:52 UTC (rev 21330)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JQueueBean.java 2011-01-31 15:50:13 UTC (rev 21331)
@@ -62,13 +62,6 @@
attributes = Attributes.getComponentAttributesFromFacesConfig(UIQueue.class, getClass());
attributes.setAttribute("rendered", true);
attributes.setAttribute("requestDelay", 750);
-
- // hidden attributes
- attributes.remove("status");
-
- // TODO attributes not implemented yet
- attributes.remove("timeout");
- attributes.remove("ignoreDupResponses");
}
public Attributes getAttributes() {
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 2011-01-31 15:34:52 UTC (rev 21330)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/extending.xhtml 2011-01-31 15:50:13 UTC (rev 21331)
@@ -46,16 +46,19 @@
</ui:define>
<ui:define name="component">
- <a4j:queue id="queue1" ignoreDupResponses="#{a4jQueueBean.attributes['ignoreDupResponses'].value}"
+ <a4j:queue id="queue1"
+ ignoreDupResponses="#{a4jQueueBean.attributes['ignoreDupResponses'].value}"
name="#{a4jQueueBean.attributes['name'].value}"
onbeforedomupdate="#{a4jQueueBean.attributes['onbeforedomupdate'].value}"
oncomplete="#{a4jQueueBean.attributes['oncomplete'].value}"
- onerror="#{a4jQueueBean.attributes['onerror'].value}" onevent="#{a4jQueueBean.attributes['event'].value}"
+ onerror="#{a4jQueueBean.attributes['onerror'].value}"
+ onevent="#{a4jQueueBean.attributes['onevent'].value}"
onrequestdequeue="#{a4jQueueBean.attributes['onrequestdequeue'].value}"
onrequestqueue="#{a4jQueueBean.attributes['onrequestqueue'].value}"
onsubmit="#{a4jQueueBean.attributes['onsubmit'].value}"
rendered="#{a4jQueueBean.attributes['rendered'].value}"
- requestDelay="#{a4jQueueBean.attributes['requestDelay'].value}" status="status1"
+ requestDelay="#{a4jQueueBean.attributes['requestDelay'].value}"
+ status="#{a4jQueueBean.attributes['status'].value}"
timeout="#{a4jQueueBean.attributes['timeout'].value}" />
<fieldset>
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 2011-01-31 15:34:52 UTC (rev 21330)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/nested.xhtml 2011-01-31 15:50:13 UTC (rev 21331)
@@ -46,16 +46,19 @@
</ui:define>
<ui:define name="component">
- <a4j:queue id="queue1" ignoreDupResponses="#{a4jQueueBean.attributes['ignoreDupResponses'].value}"
+ <a4j:queue id="queue1"
+ ignoreDupResponses="#{a4jQueueBean.attributes['ignoreDupResponses'].value}"
name="#{a4jQueueBean.attributes['name'].value}"
onbeforedomupdate="#{a4jQueueBean.attributes['onbeforedomupdate'].value}"
oncomplete="#{a4jQueueBean.attributes['oncomplete'].value}"
- onerror="#{a4jQueueBean.attributes['onerror'].value}" onevent="#{a4jQueueBean.attributes['event'].value}"
+ onerror="#{a4jQueueBean.attributes['onerror'].value}"
+ onevent="#{a4jQueueBean.attributes['onevent'].value}"
onrequestdequeue="#{a4jQueueBean.attributes['onrequestdequeue'].value}"
onrequestqueue="#{a4jQueueBean.attributes['onrequestqueue'].value}"
onsubmit="#{a4jQueueBean.attributes['onsubmit'].value}"
rendered="#{a4jQueueBean.attributes['rendered'].value}"
- requestDelay="#{a4jQueueBean.attributes['requestDelay'].value}" status="status1"
+ requestDelay="#{a4jQueueBean.attributes['requestDelay'].value}"
+ status="#{a4jQueueBean.attributes['status'].value}"
timeout="#{a4jQueueBean.attributes['timeout'].value}" />
<h:inputText id="input1" value="#{a4jAttachQueueBean.text1}" onkeypress="add(#{rich:element('events1')}); #{rich:element('timeWatcher:grid')}.event(1); ">
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 2011-01-31 15:34:52 UTC (rev 21330)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/nestedExtension.xhtml 2011-01-31 15:50:13 UTC (rev 21331)
@@ -46,16 +46,19 @@
</ui:define>
<ui:define name="component">
- <a4j:queue id="queue1" ignoreDupResponses="#{a4jQueueBean.attributes['ignoreDupResponses'].value}"
+ <a4j:queue id="queue1"
+ ignoreDupResponses="#{a4jQueueBean.attributes['ignoreDupResponses'].value}"
name="#{a4jQueueBean.attributes['name'].value}"
onbeforedomupdate="#{a4jQueueBean.attributes['onbeforedomupdate'].value}"
oncomplete="#{a4jQueueBean.attributes['oncomplete'].value}"
- onerror="#{a4jQueueBean.attributes['onerror'].value}" onevent="#{a4jQueueBean.attributes['event'].value}"
+ onerror="#{a4jQueueBean.attributes['onerror'].value}"
+ onevent="#{a4jQueueBean.attributes['onevent'].value}"
onrequestdequeue="#{a4jQueueBean.attributes['onrequestdequeue'].value}"
onrequestqueue="#{a4jQueueBean.attributes['onrequestqueue'].value}"
onsubmit="#{a4jQueueBean.attributes['onsubmit'].value}"
rendered="#{a4jQueueBean.attributes['rendered'].value}"
- requestDelay="#{a4jQueueBean.attributes['requestDelay'].value}" status="status1"
+ requestDelay="#{a4jQueueBean.attributes['requestDelay'].value}"
+ status="#{a4jQueueBean.attributes['status'].value}"
timeout="#{a4jQueueBean.attributes['timeout'].value}" />
<fieldset>
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 2011-01-31 15:34:52 UTC (rev 21330)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/formQueue.xhtml 2011-01-31 15:50:13 UTC (rev 21331)
@@ -41,17 +41,19 @@
<ui:define name="outOfTemplateBefore">
- <a4j:queue id="globalQueue" ignoreDupResponses="#{a4jQueueBean.globalQueue.attributes['ignoreDupResponses'].value}"
- name="#{a4jQueueBean.globalQueue.attributes['name'].value}"
+ <a4j:queue id="globalQueue"
+ ignoreDupResponses="#{a4jQueueBean.globalQueue.attributes['ignoreDupResponses'].value}"
onbeforedomupdate="#{a4jQueueBean.globalQueue.attributes['onbeforedomupdate'].value}"
oncomplete="#{a4jQueueBean.globalQueue.attributes['oncomplete'].value}"
- onerror="#{a4jQueueBean.globalQueue.attributes['onerror'].value}" onevent="#{a4jQueueBean.globalQueue.attributes['event'].value}"
+ onerror="#{a4jQueueBean.globalQueue.attributes['onerror'].value}"
+ onevent="#{a4jQueueBean.globalQueue.attributes['onevent'].value}"
onrequestdequeue="#{a4jQueueBean.globalQueue.attributes['onrequestdequeue'].value}"
onrequestqueue="#{a4jQueueBean.globalQueue.attributes['onrequestqueue'].value}"
onsubmit="#{a4jQueueBean.globalQueue.attributes['onsubmit'].value}"
rendered="#{a4jQueueBean.globalQueue.attributes['rendered'].value}"
requestDelay="#{a4jQueueBean.globalQueue.attributes['requestDelay'].value}"
- timeout="#{a4jQueueBean.globalQueue.attributes['timeout'].value}" />
+ timeout="#{a4jQueueBean.globalQueue.attributes['timeout'].value}"
+ status="#{a4jQueueBean.globalQueue.attributes['status'].value}" />
</ui:define>
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-01-31 15:34:52 UTC (rev 21330)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/globalQueue.xhtml 2011-01-31 15:50:13 UTC (rev 21331)
@@ -50,17 +50,21 @@
<ui:define name="component">
- <a4j:queue id="a4jQueue" ignoreDupResponses="#{a4jQueueBean.attributes['ignoreDupResponses'].value}"
+ <a4j:queue id="a4jQueue"
+ ignoreDupResponses="#{a4jQueueBean.attributes['ignoreDupResponses'].value}"
name="#{a4jQueueBean.attributes['name'].value}"
onbeforedomupdate="#{a4jQueueBean.attributes['onbeforedomupdate'].value}"
oncomplete="#{a4jQueueBean.attributes['oncomplete'].value}"
- onerror="#{a4jQueueBean.attributes['onerror'].value}" onevent="#{a4jQueueBean.attributes['event'].value}"
+ onerror="#{a4jQueueBean.attributes['onerror'].value}"
+ onevent="#{a4jQueueBean.attributes['onevent'].value}"
onrequestdequeue="#{a4jQueueBean.attributes['onrequestdequeue'].value}"
onrequestqueue="#{a4jQueueBean.attributes['onrequestqueue'].value}"
onsubmit="#{a4jQueueBean.attributes['onsubmit'].value}"
rendered="#{a4jQueueBean.attributes['rendered'].value}"
- requestDelay="#{a4jQueueBean.attributes['requestDelay'].value}" status="status1"
- timeout="#{a4jQueueBean.attributes['timeout'].value}" />
+ requestDelay="#{a4jQueueBean.attributes['requestDelay'].value}"
+ timeout="#{a4jQueueBean.attributes['timeout'].value}"
+ status="#{a4jQueueBean.attributes['status'].value}"
+ />
<h:form id="form" name="queueTestForm">
<h:panelGrid columns="2">
@@ -69,7 +73,7 @@
disabled="#{not (facesContext.maximumSeverity==null)}">
<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:inputText>
<h:outputText value="Repeated text:" />
<h:outputText value="#{a4jQueueBean.text}" id="outtext" style="font-weight:bold;" />
13 years, 7 months
JBoss Rich Faces SVN: r21330 - in trunk/ui/core/ui/src: main/java/org/richfaces/renderkit/html and 2 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2011-01-31 10:34:52 -0500 (Mon, 31 Jan 2011)
New Revision: 21330
Modified:
trunk/ui/core/ui/src/main/java/org/richfaces/component/AbstractAttachQueue.java
trunk/ui/core/ui/src/main/java/org/richfaces/component/AbstractQueue.java
trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/QueueResourceComponentRenderer.java
trunk/ui/core/ui/src/test/java/org/richfaces/component/QueueRendererTest.java
trunk/ui/core/ui/src/test/resources/org/richfaces/component/queue.xhtml
Log:
https://issues.jboss.org/browse/RF-10362
https://issues.jboss.org/browse/RF-10363
Modified: trunk/ui/core/ui/src/main/java/org/richfaces/component/AbstractAttachQueue.java
===================================================================
--- trunk/ui/core/ui/src/main/java/org/richfaces/component/AbstractAttachQueue.java 2011-01-31 15:24:37 UTC (rev 21329)
+++ trunk/ui/core/ui/src/main/java/org/richfaces/component/AbstractAttachQueue.java 2011-01-31 15:34:52 UTC (rev 21330)
@@ -68,9 +68,6 @@
public abstract int getRequestDelay();
@Attribute
- public abstract int getTimeout();
-
- @Attribute
public abstract boolean isIgnoreDupResponses();
@Attribute
Modified: trunk/ui/core/ui/src/main/java/org/richfaces/component/AbstractQueue.java
===================================================================
--- trunk/ui/core/ui/src/main/java/org/richfaces/component/AbstractQueue.java 2011-01-31 15:24:37 UTC (rev 21329)
+++ trunk/ui/core/ui/src/main/java/org/richfaces/component/AbstractQueue.java 2011-01-31 15:34:52 UTC (rev 21330)
@@ -48,9 +48,6 @@
public abstract int getRequestDelay();
@Attribute
- public abstract String getStatus();
-
- @Attribute
public abstract String getOnsubmit();
@Attribute
@@ -72,9 +69,6 @@
public abstract String getOnrequestdequeue();
@Attribute
- public abstract int getTimeout();
-
- @Attribute
public abstract boolean isIgnoreDupResponses();
@Attribute
Modified: trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/QueueResourceComponentRenderer.java
===================================================================
--- trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/QueueResourceComponentRenderer.java 2011-01-31 15:24:37 UTC (rev 21329)
+++ trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/QueueResourceComponentRenderer.java 2011-01-31 15:34:52 UTC (rev 21330)
@@ -54,7 +54,7 @@
private enum QueueOptions {
onbeforedomupdate, oncomplete, onerror, onevent, onrequestdequeue, onrequestqueue, onsubmit,
- requestDelay, timeout, status, queueId, ignoreDupResponses, requestGroupingId
+ requestDelay, queueId, ignoreDupResponses, requestGroupingId
}
private void appendOptions(UIComponent queue, Map<String, Object> optionsHash) {
Modified: trunk/ui/core/ui/src/test/java/org/richfaces/component/QueueRendererTest.java
===================================================================
--- trunk/ui/core/ui/src/test/java/org/richfaces/component/QueueRendererTest.java 2011-01-31 15:24:37 UTC (rev 21329)
+++ trunk/ui/core/ui/src/test/java/org/richfaces/component/QueueRendererTest.java 2011-01-31 15:34:52 UTC (rev 21330)
@@ -57,11 +57,11 @@
private @interface DisableQueue {}
private static final String EXPECTED_QUEUE_SCRIPT = "RichFaces.queue.setQueueOptions({" +
- "\"first\": {\"requestDelay\": 400, \"timeout\": 100, \"ignoreDupResponses\": true}," +
+ "\"first\": {\"requestDelay\": 400, \"ignoreDupResponses\": true}," +
"\"form\": {\"requestDelay\": 400}," +
- "\"form:firstAttach\": {\"timeout\": 300, \"requestGroupingId\": \"request\"}," +
- "\"second\": {\"requestDelay\": 400, \"timeout\": 100, \"ignoreDupResponses\": true}," +
- "\"form:linkAttach\": {\"timeout\": 500, \"queueId\": \"second\"}," +
+ "\"form:firstAttach\": {\"requestGroupingId\": \"request\"}," +
+ "\"second\": {\"requestDelay\": 400, \"ignoreDupResponses\": true}," +
+ "\"form:linkAttach\": {\"queueId\": \"second\"}," +
"\"form:secondAttach\": {}" +
"});";
Modified: trunk/ui/core/ui/src/test/resources/org/richfaces/component/queue.xhtml
===================================================================
--- trunk/ui/core/ui/src/test/resources/org/richfaces/component/queue.xhtml 2011-01-31 15:24:37 UTC (rev 21329)
+++ trunk/ui/core/ui/src/test/resources/org/richfaces/component/queue.xhtml 2011-01-31 15:34:52 UTC (rev 21330)
@@ -7,22 +7,22 @@
<title>Test queue page</title>
</h:head>
<h:body>
- <a4j:queue name="first" ignoreDupResponses="true" timeout="100" requestDelay="400"/>
+ <a4j:queue name="first" ignoreDupResponses="true" requestDelay="400"/>
<h:form id="form">
<a4j:queue ignoreDupResponses="false" requestDelay="400"/>
<a4j:ajax>
<h:inputText />
- <a4j:attachQueue requestGroupingId="request" timeout="300" id="firstAttach" />
+ <a4j:attachQueue requestGroupingId="request" id="firstAttach" />
</a4j:ajax>
- <a4j:queue name="second" ignoreDupResponses="true" timeout="100" requestDelay="400"/>
+ <a4j:queue name="second" ignoreDupResponses="true" requestDelay="400"/>
<a4j:ajax event="valueChange">
<h:panelGroup>
<a4j:ajax event="valueChange">
<h:inputText />
<a4j:commandLink value="Link">
- <a4j:attachQueue name="second" timeout="500" id="linkAttach" />
+ <a4j:attachQueue name="second" id="linkAttach" />
</a4j:commandLink>
<a4j:attachQueue id="secondAttach" />
13 years, 7 months
JBoss Rich Faces SVN: r21329 - trunk/ui/iteration/ui/src/main/java/org/richfaces/component.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2011-01-31 10:24:37 -0500 (Mon, 31 Jan 2011)
New Revision: 21329
Modified:
trunk/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractDataScroller.java
Log:
https://issues.jboss.org/browse/RF-10378
Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractDataScroller.java
===================================================================
--- trunk/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractDataScroller.java 2011-01-31 15:19:05 UTC (rev 21328)
+++ trunk/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractDataScroller.java 2011-01-31 15:24:37 UTC (rev 21329)
@@ -302,6 +302,7 @@
this.page = newPage;
}
+ @Attribute
public int getPage() {
UIComponent dataTable = getDataTable();
13 years, 7 months
JBoss Rich Faces SVN: r21328 - in trunk/examples/richfaces-showcase/src/main/webapp/richfaces: message/samples and 1 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: ilya_shaikovsky
Date: 2011-01-31 10:19:05 -0500 (Mon, 31 Jan 2011)
New Revision: 21328
Modified:
trunk/examples/richfaces-showcase/src/main/webapp/richfaces/hashParam/hashOptionsPopup.xhtml
trunk/examples/richfaces-showcase/src/main/webapp/richfaces/message/samples/message-sample.xhtml
trunk/examples/richfaces-showcase/src/main/webapp/richfaces/messages/samples/messages-sample.xhtml
Log:
simplified messages according to current features state. syntax errors corrections for hashParam.
Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/hashParam/hashOptionsPopup.xhtml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/hashParam/hashOptionsPopup.xhtml 2011-01-31 15:14:49 UTC (rev 21327)
+++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/hashParam/hashOptionsPopup.xhtml 2011-01-31 15:19:05 UTC (rev 21328)
@@ -8,7 +8,7 @@
<p><b>rich:hashParam</b> allows you to group client side parameters
into hash map in order to pass to client API functions of any
components.</p>
- <p>Press "Show Popup" betton in order to call the pabel. All the
+ <p>Press "Show Popup" button in order to call the panel. All the
parameters for show method passed from component control nested
a4j:param's instead of to be defined with attributes in static way. As
the show() method accepts event and options hash - all the param's
Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/message/samples/message-sample.xhtml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/message/samples/message-sample.xhtml 2011-01-31 15:14:49 UTC (rev 21327)
+++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/message/samples/message-sample.xhtml 2011-01-31 15:19:05 UTC (rev 21328)
@@ -6,15 +6,6 @@
xmlns:a4j="http://richfaces.org/a4j"
xmlns:rich="http://richfaces.org/rich">
- <style type="text/css">
-.rich-message-marker img {
- padding-right: 7px;
-}
-
-.rich-message-label {
- color: red;
-}
-</style>
<rich:panel>
<f:facet name="header">
<h:outputText value="Validation Form" />
@@ -26,42 +17,25 @@
value="#{userBean.name}">
<f:validateLength minimum="3" />
</h:inputText>
- <rich:message for="name" showDetails="true" showSummary="true">
- <f:facet name="errorMarker">
- <h:graphicImage value="/images/ajax/error.gif" />
- </f:facet>
- </rich:message>
-
+ <rich:message for="name"/>
<h:outputText value="Job:" />
<h:inputText label="Job" id="job" required="true"
value="#{userBean.job}">
<f:validateLength minimum="3" maximum="50" />
</h:inputText>
- <rich:message for="job">
- <f:facet name="errorMarker">
- <h:graphicImage value="/images/ajax/error.gif" />
- </f:facet>
- </rich:message>
+ <rich:message for="job"/>
<h:outputText value="Address:" />
<h:inputText label="Address" id="address" required="true"
value="#{userBean.address}">
<f:validateLength minimum="10" />
</h:inputText>
- <rich:message for="address">
- <f:facet name="errorMarker">
- <h:graphicImage value="/images/ajax/error.gif" />
- </f:facet>
- </rich:message>
+ <rich:message for="address"/>
<h:outputText value="Zip:" />
<h:inputText label="Zip" id="zip" required="true"
value="#{userBean.zip}">
<f:validateLength minimum="4" maximum="9" />
</h:inputText>
- <rich:message for="zip">
- <f:facet name="errorMarker">
- <h:graphicImage value="/images/ajax/error.gif" />
- </f:facet>
- </rich:message>
+ <rich:message for="zip"/>
<f:facet name="footer">
<a4j:commandButton value="Ajax Validate" />
<h:commandButton value="Common Validate" />
Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/messages/samples/messages-sample.xhtml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/messages/samples/messages-sample.xhtml 2011-01-31 15:14:49 UTC (rev 21327)
+++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/messages/samples/messages-sample.xhtml 2011-01-31 15:19:05 UTC (rev 21328)
@@ -5,39 +5,14 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:a4j="http://richfaces.org/a4j"
xmlns:rich="http://richfaces.org/rich">
- <style type="text/css">
-.rich-messages-marker img {
- padding-right: 7px;
-}
-
-.rich-message-label {
- color: red;
-}
-
-.top {
- vertical-align: top;
-}
-</style>
-<a4j:region>
<rich:panel style="width:400px">
<f:facet name="header">
<h:outputText value="Validation Form" />
</f:facet>
-
<h:form>
- <rich:messages passedLabel="Data is allowed to be stored."
- layout="list" showSummary="true" showDetails="true">
- <f:facet name="header">
- <h:outputText value="Entered Data Status:"></h:outputText>
- </f:facet>
- <f:facet name="passedMarker">
- <h:graphicImage value="/images/ajax/passed.gif" />
- </f:facet>
- <f:facet name="errorMarker">
- <h:graphicImage value="/images/ajax/error.gif" />
- </f:facet>
- </rich:messages>
-
+
+ <rich:messages
+ showSummary="true" showDetail="true"/>
<h:panelGrid columns="2">
<h:outputText value="Name:" />
<h:inputText label="Name" id="name" required="true"
@@ -66,5 +41,4 @@
</h:panelGrid>
</h:form>
</rich:panel>
-</a4j:region>
</ui:composition>
\ No newline at end of file
13 years, 7 months
JBoss Rich Faces SVN: r21327 - trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits@lists.jboss.org
Author: abelevich
Date: 2011-01-31 10:14:49 -0500 (Mon, 31 Jan 2011)
New Revision: 21327
Modified:
trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/CollapsibleSubTableRenderer.java
Log:
RF-10212 Collapsible Sub Table - add class rf-cst-r for first row
Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/CollapsibleSubTableRenderer.java
===================================================================
--- trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/CollapsibleSubTableRenderer.java 2011-01-31 14:47:54 UTC (rev 21326)
+++ trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/CollapsibleSubTableRenderer.java 2011-01-31 15:14:49 UTC (rev 21327)
@@ -121,7 +121,7 @@
public void encodeFirstRowStart(ResponseWriter writer, FacesContext context, String parentId, int currentRow, UIComponent component) throws IOException {
writer.startElement(HtmlConstants.TR_ELEMENT, component);
writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, parentId + ":" + currentRow + ":b", null);
- String styleClass = concatClasses(getFirstRowClass(context, parentId), component.getAttributes().get(ROW_CLASS));
+ String styleClass = concatClasses(getRowClass(context, parentId), getFirstRowClass(context, parentId), component.getAttributes().get(ROW_CLASS));
encodeStyleClass(writer, context, component, HtmlConstants.STYLE_CLASS_ATTR, styleClass);
}
13 years, 7 months
JBoss Rich Faces SVN: r21326 - in trunk: ui/output/ui/src/main/java/org/richfaces/component and 3 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: Alex.Kolonitsky
Date: 2011-01-31 09:47:54 -0500 (Mon, 31 Jan 2011)
New Revision: 21326
Modified:
trunk/examples/output-demo/src/main/webapp/examples/panelMenu.xhtml
trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuGroup.java
trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TooltipRenderer.java
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/tooltip.js
trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/tooltip.xmlunit.xml
Log:
RF-10326: Panel Menu Group - add @expanded reflecting state of component
RF-10238 Tooltip: element id contains '@'
Modified: trunk/examples/output-demo/src/main/webapp/examples/panelMenu.xhtml
===================================================================
--- trunk/examples/output-demo/src/main/webapp/examples/panelMenu.xhtml 2011-01-31 14:45:02 UTC (rev 21325)
+++ trunk/examples/output-demo/src/main/webapp/examples/panelMenu.xhtml 2011-01-31 14:47:54 UTC (rev 21326)
@@ -56,7 +56,7 @@
</rich:panelMenuGroup>
<rich:panelMenuItem id="item2" label="Item 2" disabled="true" />
<rich:panelMenuItem id="item3" label="Item 3" />
- <rich:panelMenuGroup id="group4" label="Group 4">
+ <rich:panelMenuGroup id="group4" label="Group 4" expanded="false">
<rich:panelMenuItem id="item41" label="Item 4.1" />
<rich:panelMenuItem id="item42" label="Item 4.2" disabled="true" />
<rich:panelMenuGroup id="group43" label="Group 4.1" disabled="true">
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuGroup.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuGroup.java 2011-01-31 14:45:02 UTC (rev 21325)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuGroup.java 2011-01-31 14:47:54 UTC (rev 21326)
@@ -125,6 +125,7 @@
this.submittedExpanded = Boolean.parseBoolean(String.valueOf(submittedValue));
}
+ @Attribute
public boolean isExpanded() {
return getValue() == null ? false : (Boolean) getValue();
}
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TooltipRenderer.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TooltipRenderer.java 2011-01-31 14:45:02 UTC (rev 21325)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TooltipRenderer.java 2011-01-31 14:47:54 UTC (rev 21326)
@@ -23,23 +23,6 @@
package org.richfaces.renderkit.html;
-import static org.richfaces.renderkit.HtmlConstants.CLASS_ATTRIBUTE;
-import static org.richfaces.renderkit.HtmlConstants.ID_ATTRIBUTE;
-import static org.richfaces.renderkit.RenderKitUtils.renderPassThroughAttributes;
-import static org.richfaces.renderkit.html.TogglePanelRenderer.addEventOption;
-import static org.richfaces.renderkit.html.TogglePanelRenderer.getAjaxOptions;
-
-import java.io.IOException;
-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;
-import javax.faces.context.PartialResponseWriter;
-import javax.faces.context.ResponseWriter;
-
import org.ajax4jsf.javascript.JSObject;
import org.richfaces.TooltipMode;
import org.richfaces.cdk.annotations.JsfRenderer;
@@ -49,6 +32,22 @@
import org.richfaces.renderkit.MetaComponentRenderer;
import org.richfaces.renderkit.util.RendererUtils;
+import javax.faces.application.ResourceDependencies;
+import javax.faces.application.ResourceDependency;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.context.PartialResponseWriter;
+import javax.faces.context.ResponseWriter;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.richfaces.renderkit.HtmlConstants.CLASS_ATTRIBUTE;
+import static org.richfaces.renderkit.HtmlConstants.ID_ATTRIBUTE;
+import static org.richfaces.renderkit.RenderKitUtils.renderPassThroughAttributes;
+import static org.richfaces.renderkit.html.TogglePanelRenderer.addEventOption;
+import static org.richfaces.renderkit.html.TogglePanelRenderer.getAjaxOptions;
+
/**
* @author amarkhel
* @since 2010-10-24
@@ -123,7 +122,7 @@
private void encodeContentBegin(ResponseWriter writer, FacesContext context, AbstractTooltip tooltip) throws IOException {
writer.startElement(getMarkupElement(tooltip), tooltip);
- writer.writeAttribute(ID_ATTRIBUTE, tooltip.getClientId(context) + "@content", null);
+ writer.writeAttribute(ID_ATTRIBUTE, tooltip.getClientId(context) + ":content", null);
writer.writeAttribute(CLASS_ATTRIBUTE, "rf-tt-cnt", null);
}
@@ -213,7 +212,7 @@
if (AbstractTooltip.CONTENT_META_COMPONENT_ID.equals(metaComponentId)) {
AbstractTooltip tooltip = (AbstractTooltip) component;
PartialResponseWriter writer = context.getPartialViewContext().getPartialResponseWriter();
- writer.startUpdate(((AbstractTooltip) component).getContentClientId(context));
+ writer.startUpdate(tooltip.getClientId(context) + ":" + AbstractTooltip.CONTENT_META_COMPONENT_ID);
encodeContentBegin(writer, context, tooltip);
for (UIComponent child : tooltip.getChildren()) {
Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/tooltip.js
===================================================================
--- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/tooltip.js 2011-01-31 14:45:02 UTC (rev 21325)
+++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/tooltip.js 2011-01-31 14:47:54 UTC (rev 21326)
@@ -244,7 +244,7 @@
},
__content : function () {
- return $(document.getElementById(this.id + "@content"));
+ return $(document.getElementById(this.id + ":content"));
},
__fireHide : function () {
Modified: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/tooltip.xmlunit.xml
===================================================================
--- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/tooltip.xmlunit.xml 2011-01-31 14:45:02 UTC (rev 21325)
+++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/tooltip.xmlunit.xml 2011-01-31 14:47:54 UTC (rev 21326)
@@ -1,6 +1,6 @@
<span id="f:tooltip" class="rf-tt">
<span id="f:tooltip:cntr" class="rf-tt-cntr">
- <span id="f:tooltip@content" class="rf-tt-cnt"></span>
+ <span id="f:tooltip:content" class="rf-tt-cnt"></span>
</span>
<script type="text/javascript">
// Text
13 years, 7 months