JBoss Rich Faces SVN: r6458 - in trunk/ui/dataTable/src/main: templates/org/richfaces and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2008-02-29 10:18:50 -0500 (Fri, 29 Feb 2008)
New Revision: 6458
Modified:
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
trunk/ui/dataTable/src/main/templates/org/richfaces/htmlDataTable.jspx
Log:
Rendering of table headers. Revert changes of revision 6456.
Modified: trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
===================================================================
--- trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2008-02-29 15:12:25 UTC (rev 6457)
+++ trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2008-02-29 15:18:50 UTC (rev 6458)
@@ -89,10 +89,6 @@
encodeCaption(context, table);
encodeHeader(context, table, columns);
encodeFooter(context, table, columns);
-
- AjaxContext ajaxContext = AjaxContext.getCurrentInstance(context);
- ajaxContext.removeRenderedArea(table.getClientId(context));
- ajaxContext.addRenderedArea(table.getClientId(context) + "tbody");
}
public void encodeHeader(FacesContext context, UIDataTable table,
@@ -570,7 +566,6 @@
if (sortableColumn) {
writer.startElement(HTML.SPAN_ELEM, column);
- writer.writeAttribute(HTML.id_ATTRIBUTE, column.getClientId(context) + "sortSpan", null);
String spanClass = "";
if (Ordering.ASCENDING.equals(col.getSortOrder())) {
@@ -579,9 +574,6 @@
spanClass = "dr-table-header-sort-down dr-table-sortable-header";
}
writer.writeAttribute(HTML.class_ATTRIBUTE, spanClass, null);
-
- AjaxContext ajaxContext = AjaxContext.getCurrentInstance(context);
- ajaxContext.addRenderedArea(column.getClientId(context) + "sortSpan");
}
}
Modified: trunk/ui/dataTable/src/main/templates/org/richfaces/htmlDataTable.jspx
===================================================================
--- trunk/ui/dataTable/src/main/templates/org/richfaces/htmlDataTable.jspx 2008-02-29 15:12:25 UTC (rev 6457)
+++ trunk/ui/dataTable/src/main/templates/org/richfaces/htmlDataTable.jspx 2008-02-29 15:18:50 UTC (rev 6458)
@@ -27,7 +27,7 @@
<f:parameter value="value,name,type,id,class,rows,style" />
</f:call>
<f:call name="encodeTableStructure"/>
- <tbody id="#{clientId}tbody" >
+ <tbody>
<vcp:body>
<f:call name="encodeRows"/>
</vcp:body>
16 years, 10 months
JBoss Rich Faces SVN: r6457 - trunk/sandbox/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: vmolotkov
Date: 2008-02-29 10:12:25 -0500 (Fri, 29 Feb 2008)
New Revision: 6457
Modified:
trunk/sandbox/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js
Log:
showControls corrected
Modified: trunk/sandbox/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js
===================================================================
--- trunk/sandbox/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js 2008-02-29 15:03:25 UTC (rev 6456)
+++ trunk/sandbox/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js 2008-02-29 15:12:25 UTC (rev 6457)
@@ -43,6 +43,9 @@
if (!this.comboList.isList || this.clickOnBar) {
this.comboList.hideWithDelay();
}
+ if (this.attributes.showControls) {
+ this.inputProcessing();
+ }
this.comboList.isList = false;
/*this.comboList.hideWithDelay();*/
16 years, 10 months
JBoss Rich Faces SVN: r6456 - in trunk/ui/dataTable/src/main: templates/org/richfaces and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2008-02-29 10:03:25 -0500 (Fri, 29 Feb 2008)
New Revision: 6456
Modified:
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
trunk/ui/dataTable/src/main/templates/org/richfaces/htmlDataTable.jspx
Log:
Rendering of table headers. Some optimization.
Modified: trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
===================================================================
--- trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2008-02-29 14:59:59 UTC (rev 6455)
+++ trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2008-02-29 15:03:25 UTC (rev 6456)
@@ -89,6 +89,10 @@
encodeCaption(context, table);
encodeHeader(context, table, columns);
encodeFooter(context, table, columns);
+
+ AjaxContext ajaxContext = AjaxContext.getCurrentInstance(context);
+ ajaxContext.removeRenderedArea(table.getClientId(context));
+ ajaxContext.addRenderedArea(table.getClientId(context) + "tbody");
}
public void encodeHeader(FacesContext context, UIDataTable table,
@@ -566,6 +570,8 @@
if (sortableColumn) {
writer.startElement(HTML.SPAN_ELEM, column);
+ writer.writeAttribute(HTML.id_ATTRIBUTE, column.getClientId(context) + "sortSpan", null);
+
String spanClass = "";
if (Ordering.ASCENDING.equals(col.getSortOrder())) {
spanClass = "dr-table-header-sort-up dr-table-sortable-header";
@@ -573,6 +579,9 @@
spanClass = "dr-table-header-sort-down dr-table-sortable-header";
}
writer.writeAttribute(HTML.class_ATTRIBUTE, spanClass, null);
+
+ AjaxContext ajaxContext = AjaxContext.getCurrentInstance(context);
+ ajaxContext.addRenderedArea(column.getClientId(context) + "sortSpan");
}
}
Modified: trunk/ui/dataTable/src/main/templates/org/richfaces/htmlDataTable.jspx
===================================================================
--- trunk/ui/dataTable/src/main/templates/org/richfaces/htmlDataTable.jspx 2008-02-29 14:59:59 UTC (rev 6455)
+++ trunk/ui/dataTable/src/main/templates/org/richfaces/htmlDataTable.jspx 2008-02-29 15:03:25 UTC (rev 6456)
@@ -27,7 +27,7 @@
<f:parameter value="value,name,type,id,class,rows,style" />
</f:call>
<f:call name="encodeTableStructure"/>
- <tbody>
+ <tbody id="#{clientId}tbody" >
<vcp:body>
<f:call name="encodeRows"/>
</vcp:body>
16 years, 10 months
JBoss Rich Faces SVN: r6455 - trunk/ui/progressBAR/src/main/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-02-29 09:59:59 -0500 (Fri, 29 Feb 2008)
New Revision: 6455
Modified:
trunk/ui/progressBAR/src/main/java/org/richfaces/component/UIProgressBar.java
Log:
the last changes in progress bar
Modified: trunk/ui/progressBAR/src/main/java/org/richfaces/component/UIProgressBar.java
===================================================================
--- trunk/ui/progressBAR/src/main/java/org/richfaces/component/UIProgressBar.java 2008-02-29 14:58:41 UTC (rev 6454)
+++ trunk/ui/progressBAR/src/main/java/org/richfaces/component/UIProgressBar.java 2008-02-29 14:59:59 UTC (rev 6455)
@@ -49,11 +49,38 @@
/** Percent param name */
private static final String PERCENT_PARAM = "percent";
+
+ /** Max value attribute name */
+ private static final String _maxValue = "maxValue";
+
+ /** Min value attribute name */
+ private static final String _minValue = "minValue";
+
+ /** Enabled attribute name */
+ private static final String _enabled = "enabled";
+
+ /** Enabled attribute name */
+ private static final String _interval = "interval";
+
+ /** Complete class attribute name */
+ private static final String _completeClass = "completeClass";
- /*
- * (non-Javadoc)
- *
- * @see org.ajax4jsf.component.AjaxActionComponent#broadcast(javax.faces.event.FacesEvent)
+ /** Remain class attribute name */
+ private static final String _remainClass = "remainClass";
+
+ /** Style class attribute name */
+ private static final String _styleClass = "styleClass";
+
+ /** Markup data key */
+ private static final String _markup = "markup";
+
+ /** Context key */
+ private static final String _context = "context";
+
+ /**
+ * Method performs broadcasting of jsf events to progress bar component
+ *
+ * @param event - Faces Event instance
*/
public void broadcast(FacesEvent event) throws AbortProcessingException {
@@ -83,7 +110,7 @@
ajaxContext
.setResponseData(getResponseData(value, facesContext));
- Object reRender = this.getAttributes().get("reRender");
+ Object reRender = this.getAttributes().get(AjaxRendererUtils.AJAX_REGIONS_ATTRIBUTE);
Set ajaxRegions = AjaxRendererUtils.asSet(reRender);
if (ajaxRegions != null) {
@@ -114,26 +141,23 @@
Map<Object, Object> map = new HashMap<Object, Object>();
map.put(RendererUtils.HTML.value_ATTRIBUTE, value);
- map.put("interval", this.getInterval());
+ map.put(_interval, this.getInterval());
if (this.getAttributes().get(RendererUtils.HTML.style_ATTRIBUTE) != null) {
map.put(RendererUtils.HTML.style_ATTRIBUTE, this.getAttributes().get(RendererUtils.HTML.style_ATTRIBUTE));
}
- boolean enabled = (Boolean) this.getAttributes().get("enabled");
- map.put("enabled", Boolean.toString(enabled));
+ boolean enabled = (Boolean) this.getAttributes().get(_enabled);
+ map.put(_enabled, Boolean.toString(enabled));
if (!isSimple(renderer)) {
- map.put("markup", getMarkup(facesContext, renderer));
- map.put("context", getContext(renderer, value));
+ map.put(_markup, getMarkup(facesContext, renderer));
+ map.put(_context, getContext(renderer, value));
}
- addStyles2Responce(map, "completeClass", this.getAttributes().get(
- "completeClass"));
- addStyles2Responce(map, "remainClass", this.getAttributes().get(
- "remainClass"));
- addStyles2Responce(map, "styleClass", this.getAttributes().get(
- "styleClass"));
+ addStyles2Responce(map, _completeClass, this.getAttributes().get(_completeClass));
+ addStyles2Responce(map, _remainClass, this.getAttributes().get(_remainClass));
+ addStyles2Responce(map, _styleClass, this.getAttributes().get(_styleClass));
return map;
}
@@ -148,16 +172,14 @@
private JSLiteral getContext(AbstractProgressBarRenderer renderer,
Number percent) {
StringBuffer buffer = new StringBuffer("{");
- final String minValueAttr = "minValue";
- final String maxValueAttr = "maxValue";
- buffer.append("value:")
- .append(ScriptUtils.toScript(percent.toString())).append(",");
- buffer.append("minValue:").append(
- ScriptUtils.toScript(this.getAttributes().get(minValueAttr)
- .toString())).append(",");
- buffer.append("maxValue:").append(
- ScriptUtils.toScript(this.getAttributes().get(maxValueAttr)
- .toString()));
+ buffer.append("value:");
+ buffer.append(ScriptUtils.toScript(percent.toString())).append(",");
+ buffer.append("minValue:");
+ buffer.append(ScriptUtils.toScript(this.getAttributes().get(_minValue)
+ .toString())).append(",");
+ buffer.append("maxValue:");
+ buffer.append(ScriptUtils.toScript(this.getAttributes().get(_maxValue)
+ .toString()));
String parameters = renderer.getParameters(this);
if (parameters != null) {
@@ -222,14 +244,14 @@
Number result = new Integer(0);
if (v != null) {
try {
- if (v instanceof String) {
+ if (v instanceof String) { // String
result = Double.parseDouble((String) v);
} else {
Number n = (Number) v;
- if ((n instanceof BigDecimal) || (n instanceof Double)
+ if ((n instanceof BigDecimal) || (n instanceof Double) // Double or BigDecimal
|| (n instanceof Float)) {
result = n.floatValue();
- } else if (n instanceof Integer) {
+ } else if (n instanceof Integer) { // Integer
result = n.intValue();
}
}
16 years, 10 months
JBoss Rich Faces SVN: r6454 - in management/design: inplaceInput and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2008-02-29 09:58:41 -0500 (Fri, 29 Feb 2008)
New Revision: 6454
Modified:
management/design/comboBox/comboBox.doc
management/design/inplaceInput/FuncSpec - InplaceInput.doc
Log:
Modified: management/design/comboBox/comboBox.doc
===================================================================
(Binary files differ)
Modified: management/design/inplaceInput/FuncSpec - InplaceInput.doc
===================================================================
(Binary files differ)
16 years, 10 months
JBoss Rich Faces SVN: r6453 - trunk/ui/progressBAR/src/main/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-02-29 09:17:01 -0500 (Fri, 29 Feb 2008)
New Revision: 6453
Modified:
trunk/ui/progressBAR/src/main/java/org/richfaces/component/UIProgressBar.java
Log:
some fixs
Modified: trunk/ui/progressBAR/src/main/java/org/richfaces/component/UIProgressBar.java
===================================================================
--- trunk/ui/progressBAR/src/main/java/org/richfaces/component/UIProgressBar.java 2008-02-29 13:59:55 UTC (rev 6452)
+++ trunk/ui/progressBAR/src/main/java/org/richfaces/component/UIProgressBar.java 2008-02-29 14:17:01 UTC (rev 6453)
@@ -26,25 +26,28 @@
import org.ajax4jsf.javascript.JSLiteral;
import org.ajax4jsf.javascript.ScriptUtils;
import org.ajax4jsf.renderkit.AjaxRendererUtils;
+import org.ajax4jsf.renderkit.RendererUtils;
import org.richfaces.renderkit.AbstractProgressBarRenderer;
/**
- * TODO Class description goes here.
+ * Class provides base component class for progress bar
*
* @author "Andrey Markavtsov"
*
*/
-
// TODO add @since declaration
public abstract class UIProgressBar extends UIPoll {
+ /** Component type */
public static final String COMPONENT_TYPE = "org.richfaces.ProgressBar";
+ /** Component family */
public static final String COMPONENT_FAMILY = "org.richfaces.ProgressBar";
/** Request parameter name containing component state to render */
public static final String FORCE_PERCENT_PARAM = "forcePercent";
+ /** Percent param name */
private static final String PERCENT_PARAM = "percent";
/*
@@ -75,7 +78,7 @@
if (!params.containsKey(FORCE_PERCENT_PARAM)
&& params.containsKey(PERCENT_PARAM)) {
- Number value = getNumber(this.getAttributes().get("value"));
+ Number value = getNumber(this.getAttributes().get(RendererUtils.HTML.value_ATTRIBUTE));
ajaxContext.removeRenderedArea(clientId);
ajaxContext
.setResponseData(getResponseData(value, facesContext));
@@ -110,11 +113,11 @@
.getRenderer(facesContext);
Map<Object, Object> map = new HashMap<Object, Object>();
- map.put("value", value);
+ map.put(RendererUtils.HTML.value_ATTRIBUTE, value);
map.put("interval", this.getInterval());
- if (this.getAttributes().get("style") != null) {
- map.put("style", this.getAttributes().get("style"));
+ if (this.getAttributes().get(RendererUtils.HTML.style_ATTRIBUTE) != null) {
+ map.put(RendererUtils.HTML.style_ATTRIBUTE, this.getAttributes().get(RendererUtils.HTML.style_ATTRIBUTE));
}
boolean enabled = (Boolean) this.getAttributes().get("enabled");
@@ -145,13 +148,15 @@
private JSLiteral getContext(AbstractProgressBarRenderer renderer,
Number percent) {
StringBuffer buffer = new StringBuffer("{");
+ final String minValueAttr = "minValue";
+ final String maxValueAttr = "maxValue";
buffer.append("value:")
.append(ScriptUtils.toScript(percent.toString())).append(",");
buffer.append("minValue:").append(
- ScriptUtils.toScript(this.getAttributes().get("minValue")
+ ScriptUtils.toScript(this.getAttributes().get(minValueAttr)
.toString())).append(",");
buffer.append("maxValue:").append(
- ScriptUtils.toScript(this.getAttributes().get("maxValue")
+ ScriptUtils.toScript(this.getAttributes().get(maxValueAttr)
.toString()));
String parameters = renderer.getParameters(this);
@@ -210,8 +215,7 @@
/**
* Converts value attr to number value
*
- * @param v -
- * value attr
+ * @param v - value attr
* @return result
*/
public Number getNumber(Object v) {
@@ -222,15 +226,15 @@
result = Double.parseDouble((String) v);
} else {
Number n = (Number) v;
- if (n instanceof BigDecimal || n instanceof Double
- || n instanceof Float) {
+ if ((n instanceof BigDecimal) || (n instanceof Double)
+ || (n instanceof Float)) {
result = n.floatValue();
} else if (n instanceof Integer) {
result = n.intValue();
}
}
} catch (Exception e) {
- // TODO: handle exception
+ e.getMessage();
}
}
return result;
16 years, 10 months
JBoss Rich Faces SVN: r6452 - in trunk/sandbox/samples/sortingFilteringDemo/src/main: webapp/WEB-INF and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2008-02-29 08:59:55 -0500 (Fri, 29 Feb 2008)
New Revision: 6452
Added:
trunk/sandbox/samples/sortingFilteringDemo/src/main/java/org/richfaces/sandbox/Bean.java
Modified:
trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/WEB-INF/faces-config.xml
trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/WEB-INF/web.xml
trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/pages/index.jsp
Log:
update demo
Added: trunk/sandbox/samples/sortingFilteringDemo/src/main/java/org/richfaces/sandbox/Bean.java
===================================================================
--- trunk/sandbox/samples/sortingFilteringDemo/src/main/java/org/richfaces/sandbox/Bean.java (rev 0)
+++ trunk/sandbox/samples/sortingFilteringDemo/src/main/java/org/richfaces/sandbox/Bean.java 2008-02-29 13:59:55 UTC (rev 6452)
@@ -0,0 +1,61 @@
+/**
+ *
+ */
+package org.richfaces.sandbox;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.richfaces.model.Ordering;
+
+/**
+ * @author Konstantin Mishin
+ *
+ */
+public class Bean {
+
+ private String sortMode;
+ private Ordering[] sortOrder;
+ private Collection<String> sortPriority;
+
+ public Bean() {
+ sortOrder = new Ordering[4];
+ clearSortOrder();
+ sortPriority = new ArrayList<String>();
+ }
+
+ private void clearSortOrder() {
+ for (int i = 0; i < sortOrder.length; i++) {
+ sortOrder[i] = Ordering.UNSORTED;
+ }
+ }
+
+ public String getSortMode() {
+ return sortMode;
+ }
+
+ public void setSortMode(String sortMode) {
+ this.sortMode = sortMode;
+ }
+
+ public Collection<String> getSortPriority() {
+ return sortPriority;
+ }
+
+ public void setSortPriority(Collection<String> sortPriority) {
+ this.sortPriority = sortPriority;
+ }
+
+ public void clearSortPriority() {
+ sortPriority.clear();
+ clearSortOrder();
+ }
+
+ public Ordering[] getSortOrder() {
+ return sortOrder;
+ }
+
+ public void setSortOrder(Ordering[] sortOrder) {
+ this.sortOrder = sortOrder;
+ }
+}
Modified: trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/WEB-INF/faces-config.xml 2008-02-29 13:51:32 UTC (rev 6451)
+++ trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/WEB-INF/faces-config.xml 2008-02-29 13:59:55 UTC (rev 6452)
@@ -8,6 +8,11 @@
<managed-bean-scope>application</managed-bean-scope>
</managed-bean>
<managed-bean>
+ <managed-bean-name>bean</managed-bean-name>
+ <managed-bean-class>org.richfaces.sandbox.Bean</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ </managed-bean>
+ <managed-bean>
<managed-bean-name>userComparator</managed-bean-name>
<managed-bean-class>org.richfaces.sandbox.UserComparator</managed-bean-class>
<managed-bean-scope>application</managed-bean-scope>
Modified: trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/WEB-INF/web.xml 2008-02-29 13:51:32 UTC (rev 6451)
+++ trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/WEB-INF/web.xml 2008-02-29 13:59:55 UTC (rev 6452)
@@ -11,10 +11,6 @@
<param-value>server</param-value>
</context-param>
<context-param>
- <param-name>org.ajax4jsf.xmlparser.ORDER</param-name>
- <param-value>NEKO</param-value>
- </context-param>
- <context-param>
<param-name>org.richfaces.demo.MAX_ISSUES</param-name>
<param-value>100</param-value>
</context-param>
Modified: trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/pages/index.jsp
===================================================================
--- trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/pages/index.jsp 2008-02-29 13:51:32 UTC (rev 6451)
+++ trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/pages/index.jsp 2008-02-29 13:59:55 UTC (rev 6452)
@@ -9,26 +9,35 @@
<body>
<f:view>
<h:form>
- <dt:dataTable value="#{jiraService.channel.issues}" var="issue">
- <dt:column filterBy="#{issue.key.value}" filterValue="CH-" sortBy="#{issue.key}" width="60px">
+ <h:outputText value="SortMode:"></h:outputText>
+ <h:selectOneRadio value="#{bean.sortMode}">
+ <f:selectItem itemLabel="single" itemValue="single"/>
+ <f:selectItem itemLabel="multi" itemValue="multi"/>
+ <a4j:support event="onchange" reRender="dataTable" action="#{bean.clearSortPriority}"></a4j:support>
+ </h:selectOneRadio>
+ <dt:dataTable id="dataTable" value="#{jiraService.channel.issues}" var="issue" sortMode="#{bean.sortMode}" sortPriority="#{bean.sortPriority}">
+ <dt:column filterBy="#{issue.key.value}" filterValue="CH-" sortBy="#{issue.key}" width="60px"
+ sortOrder="#{bean.sortOrder[0]}">
<f:facet name="header">
<h:outputText value="Key"></h:outputText>
</f:facet>
<h:outputText value="#{issue.key.value}"></h:outputText>
</dt:column>
- <dt:column sortBy="#{issue.summary}" width="400px">
+ <dt:column sortBy="#{issue.summary}" width="400px" sortOrder="#{bean.sortOrder[1]}">
<f:facet name="header">
<h:outputText value="Summary"></h:outputText>
</f:facet>
<h:outputText value="#{issue.summary}"></h:outputText>
</dt:column>
- <dt:column width="150px" filterBy="#{issue.assignee.name}" comparator="#{comparators.assigneeComparator}">
+ <dt:column width="150px" filterBy="#{issue.assignee.name}" comparator="#{comparators.assigneeComparator}"
+ sortOrder="#{bean.sortOrder[2]}">
<f:facet name="header">
<h:outputText value="Assignee"></h:outputText>
</f:facet>
<h:outputText value="#{issue.assignee.name}"></h:outputText>
</dt:column>
- <dt:column filterBy="#{issue.reporter.name}" width="150px" comparator="#{comparators.reporterComparator}">
+ <dt:column filterBy="#{issue.reporter.name}" width="150px" comparator="#{comparators.reporterComparator}"
+ sortOrder="#{bean.sortOrder[3]}">
<f:facet name="header">
<h:outputText value="Reporter"></h:outputText>
</f:facet>
16 years, 10 months
JBoss Rich Faces SVN: r6451 - trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: vmolotkov
Date: 2008-02-29 08:51:32 -0500 (Fri, 29 Feb 2008)
New Revision: 6451
Modified:
trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js
Log:
defaultLabel functionality is corrected
Modified: trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js
===================================================================
--- trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js 2008-02-29 13:36:26 UTC (rev 6450)
+++ trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js 2008-02-29 13:51:32 UTC (rev 6451)
@@ -214,7 +214,8 @@
startChangedState : function () {
this.changeState(Richfaces.InplaceInput.STATES[2]);
- this.createNewText(this.valueKeeper.value);
+ //this.createNewText(this.valueKeeper.value);
+ this.createNewText(this.currentText);
this.inplaceInput.className = this.classes.COMPONENT.CHANGED.NORMAL;
this.strut.hide();
},
@@ -272,16 +273,36 @@
if (userValue == "") {
this.setDefaultText();
this.valueKeeper.value = "";
- this.startViewState();
- } else if (userValue != this.value) {
+ //this.startViewState();
+ } else {
this.currentText = userValue;
this.valueKeeper.value = userValue;
+ }
+ if (userValue != this.value) {
this.startChangedState();
} else {
- this.currentText = userValue;
- this.valueKeeper.value = userValue;
this.startViewState();
- }
+ }
+ /*if (userValue != this.value) {
+ if (userValue == "") {
+ this.setDefaultText();
+ this.valueKeeper.value = "";
+ //this.startViewState();
+ } else {
+ this.currentText = userValue;
+ this.valueKeeper.value = userValue;
+ }
+ this.startChangedState();
+ } else {
+ if (userValue == "") {
+ this.setDefaultText();
+ this.valueKeeper.value = "";
+ } else {
+ this.currentText = userValue;
+ this.valueKeeper.value = userValue;
+ }
+ this.startViewState();
+ } */
if (this.events.onviewactivated) {
this.inplaceInput.fire("rich:onviewactivated", {oldValue : this.valueKeeper.value, value : this.tempValueKeeper.value});
}
16 years, 10 months
JBoss Rich Faces SVN: r6450 - Plan/3.2.0 and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: tkuprevich
Date: 2008-02-29 08:36:26 -0500 (Fri, 29 Feb 2008)
New Revision: 6450
Modified:
trunk/test-applications/qa/Test Plan/3.2.0/TestPlan-RF-3.2.0.doc
Log:
Modified: trunk/test-applications/qa/Test Plan/3.2.0/TestPlan-RF-3.2.0.doc
===================================================================
(Binary files differ)
16 years, 10 months
JBoss Rich Faces SVN: r6449 - trunk/sandbox/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/css.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-02-29 08:34:33 -0500 (Fri, 29 Feb 2008)
New Revision: 6449
Modified:
trunk/sandbox/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/css/inplaceselect.xcss
Log:
new css styles
Modified: trunk/sandbox/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/css/inplaceselect.xcss
===================================================================
--- trunk/sandbox/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/css/inplaceselect.xcss 2008-02-29 13:33:28 UTC (rev 6448)
+++ trunk/sandbox/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/css/inplaceselect.xcss 2008-02-29 13:34:33 UTC (rev 6449)
@@ -6,7 +6,7 @@
<f:verbatim>
<![CDATA[
-/* *{font-family : verdana; font-size:11px;} */
+ /* {font-family : verdana; font-size:11px;} */
/* body{padding : 30px;} */
/* fieldset{padding : 30px; border : 1px solid #c0c0c0;} */
/* legend{font-weight : bold} */
@@ -41,10 +41,11 @@
.rich-inplace-select-field {
padding : 0px 0px 0px 0px;
border-width: 1px;
- border-style: none;
+ border-style: inset;
margin : 0px;
background-position : center right;
background-repeat : no-repeat;
+ font: inherit;
}
.rich-inplace-select-strut{
@@ -67,7 +68,7 @@
background-position: top;
background-repeat: repeat-x;
border-width: 1px;
- border-style: inset;
+ border-style: none;
padding : 0px;
margin : 0px;
}
@@ -186,12 +187,6 @@
<u:style name="background-color" skin="editBackgroundColor"/>
</u:selector>
- <u:selector name=".rich-inplace-select-font">
- <u:style name="font-size" skin="generalSizeFont"/>
- <u:style name="font-family" skin="generalFamilyFont"/>
- <u:style name="color" skin="generalTextColor"/>
- </u:selector>
-
<u:selector name=".rich-inplace-select-selected-item">
<u:style name="color" skin="generalTextColor"/>
</u:selector>
16 years, 10 months