JBoss Rich Faces SVN: r4634 - branches/3.1.x/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits@lists.jboss.org
Author: artdaw
Date: 2007-12-08 10:59:02 -0500 (Sat, 08 Dec 2007)
New Revision: 4634
Modified:
branches/3.1.x/docs/userguide/en/src/main/docbook/included/orderingList.xml
Log:
http://jira.jboss.com/jira/browse/RF-1184 -
controlsPosition, controlsLayout comment-out in Details of Usage in accordance with Table of Attributes.
Comment-out footer facet
add "topControlLabel" , "bottomControlLabel" , "upControlLabel" , "downControlLabel" attributes.
edit examples.
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/orderingList.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/orderingList.xml 2007-12-08 15:58:31 UTC (rev 4633)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/orderingList.xml 2007-12-08 15:59:02 UTC (rev 4634)
@@ -103,7 +103,7 @@
<para>Controls rendering is based on the <emphasis>
<property>"controlsType" </property>
- </emphasis> attribute. Possible types are button, link, none.
+ </emphasis> attribute. Possible types are button or none.
</para>
<para>
@@ -132,9 +132,11 @@
<property>"caption"</property>
</emphasis>, <emphasis>
<property>"header"</property>
- </emphasis> and <emphasis>
+ </emphasis>
+
+ <!--and <emphasis>
<property>"footer" </property>
- </emphasis> facets. A caption could be also defined with <emphasis>
+ </emphasis> --> facets. A caption could be also defined with <emphasis>
<property>"captionLabel"</property>
</emphasis> attribute.</para>
@@ -146,22 +148,24 @@
</para>
<programlisting role="XML"><![CDATA[...
<rich:orderingList value="#{bean.simpleItems}" var="item" controlsType="button" selection="#{bean.selection}">
- <f:facet name="caption"><h:outputText value="Caption Facet" /></f:facet>
- <f:facet name="header"><h:outputText value="Header Facet" /></f:facet>
- <h:outputText value="#{item}" />
+ <f:facet name="caption">
+ <h:outputText value="Caption Facet" />
+ </f:facet>
<rich:column>
- <f:facet name="header">
- <h:outputText value="Cars" />
- </f:facet>
- <h:outputText value="#{item.name}" />
+ <f:facet name="header">
+ <h:outputText value="Cars" />
+ </f:facet>
+ <h:outputText value="#{item.name}" />
</rich:column>
- <rich:column>
- <f:facet name="header">
- <h:outputText value="Price" />
- </f:facet>
- <h:outputText value="#{item.price}" />
+ <rich:column>
+ <f:facet name="header">
+ <h:outputText value="Price" />
+ </f:facet>
+ <h:outputText value="#{item.price}" />
</rich:column>
- <f:facet name="footer"><h:outputText value="Footer Facet" /></f:facet>
+ <f:facet name="footer">
+ <h:outputText value="Footer Facet" />
+ </f:facet>
</rich:orderingList>
...]]></programlisting>
@@ -187,29 +191,34 @@
<property> "downControl"</property>
</emphasis> , <emphasis>
<property> "downControlDisabled" </property>
- </emphasis> facets are used to replaces the default control with facets content.</para>
+ </emphasis> facets are used to replaces the default control with facets content.
+ </para>
+ <para>An <property>ordering controls set</property> could be also defined with
+ <emphasis><property>"topControlLabel"</property></emphasis>, <emphasis><property>"bottomControlLabel"</property></emphasis>,
+ <emphasis><property>"upControlLabel"</property></emphasis>, <emphasis><property>"downControlLabel"</property></emphasis>attributes.
+ </para>
<para>
<emphasis role="bold">Example:</emphasis>
</para>
<programlisting role="XML"><![CDATA[...
<rich:orderingList value="#{bean.simpleItems}" var="item" controlsType="button" selection="#{bean.selection}">
<f:facet name="topControl">
- <h:outputText value="Move to top">
+ <h:outputText value="Move to top" />
</f:facet>
- <f:facet name="upControl">
- <h:outputText value="Move up">
+ <f:facet name="upControl">
+ <h:outputText value="Move up" />
</f:facet>
- <f:facet name="downControl">
- <h:outputText value="Move down">
+ <f:facet name="downControl">
+ <h:outputText value="Move down" />
</f:facet>
- <f:facet name="bottomControl">
- <h:outputText value="Move to bottom">
+ <f:facet name="bottomControl">
+ <h:outputText value="Move to bottom" />
</f:facet>
<rich:orderingList>
...]]></programlisting>
<para>The position of the controls relatively to a list could be customized with: <itemizedlist>
- <listitem>
+ <!--listitem>
<emphasis>
<property>"controlsPosition"</property>
</emphasis> attribute. Possible values: <itemizedlist>
@@ -219,7 +228,7 @@
<listitem>top - controls could be rendered above the list </listitem>
<listitem>bottom - controls could be rendered below the list </listitem>
</itemizedlist>
- </listitem>
+ </listitem-->
<listitem><emphasis>
<property> "controlsHorizontalAlign"</property>
</emphasis> attribute. Possible values: <itemizedlist>
@@ -237,13 +246,13 @@
</listitem>
</itemizedlist>
</listitem>
- <listitem><emphasis>
+ <!--listitem><emphasis>
<property>"controlsLayout"</property>
</emphasis> attribute. Possible values: <itemizedlist>
<listitem>inline - controls defined one by one in line </listitem>
<listitem>block - controls defined in column </listitem>
</itemizedlist>
- </listitem>
+ </listitem-->
</itemizedlist>
</para>
18 years, 5 months
JBoss Rich Faces SVN: r4633 - branches/3.1.x/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits@lists.jboss.org
Author: artdaw
Date: 2007-12-08 10:58:31 -0500 (Sat, 08 Dec 2007)
New Revision: 4633
Modified:
branches/3.1.x/docs/userguide/en/src/main/docbook/included/listShuttle.xml
Log:
http://jira.jboss.com/jira/browse/RF-1174 -
controlsType comment-out in Details of Usage in accordance with Table of Attributes.
Comment-out footer facet.
"copy_disabled" , "remove_disabled", "copyAll_disabled" , "removeAll_disabled" facets do not work. Comment-out.
add "topControlLabel" , "bottomControlLabel" , "upControlLabel" , "downControlLabel" attributes.
edit examples.
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/listShuttle.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/listShuttle.xml 2007-12-08 12:48:41 UTC (rev 4632)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/listShuttle.xml 2007-12-08 15:58:31 UTC (rev 4633)
@@ -13,14 +13,20 @@
<emphasis role="bold">Example:</emphasis>
</para>
<programlisting role="XML"><![CDATA[...
-<rich:listShuttle value="#{bean.list}" var="list" selection="#{value.resultList}">
- <f:facet name="header">
- <h:outputText value="Header1"/>
+<rich:listShuttle var="item" sourceValue="#{bean.source}" targetValue="#{bean.target}" sourceSelection="#{bean.sourceSelection}" targetSelection="#{bean.targetSelection}">
+ <f:facet name="sourceCaption">
+ <h:outputText value="Cars Store #1" />
</f:facet>
- <rich:column>
- <h:outputText value="#{list.text}">
- </rich:column>
-<rich:listShuttle>
+ <f:facet name="targetCaption">
+ <h:outputText value="Cars Store #2" />
+ </f:facet>
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Cars" />
+ </f:facet>
+ <h:outputText value="#{item.name}" />
+ </h:column>
+</rich:listShuttle>
...]]></programlisting>
</section>
<section>
@@ -41,10 +47,10 @@
<listitem>two <property>item lists</property> (source and target). List consists of
items. Each item has three different representations: common, selected, active</listitem>
<listitem>optional <property>caption</property>, <property>header</property> (sorted
- and non-sorted), <property>footer</property> elements</listitem>
- <listitem><property>copy/moving controls set</property>is a set of controls, which
+ and non-sorted)<!--, <property>footer</property>--> elements</listitem>
+ <listitem><property>copy/moving controls set</property> is a set of controls, which
performs moving/copying items between lists</listitem>
- <listitem><property>optional ordering controls set</property>is a set of controls
+ <listitem><property>optional ordering controls set</property> is a set of controls
that performs reordering</listitem>
</itemizedlist>
</para>
@@ -62,19 +68,19 @@
<emphasis role="bold">Example:</emphasis>
</para>
<programlisting role="XML"><![CDATA[...
-<rich:listShuttle sourceValue="#{bean.list}" var="list" value="#{value.resultList}">
+<rich:listShuttle var="item" sourceValue="#{bean.source}" targetValue="#{bean.target}" sourceSelection="#{bean.sourceSelection}" targetSelection="#{bean.targetSelection}">
<f:facet name="source">
- <rich:column>
- <h:outputText value="#{list.text}"/>
- </rich:column>
+ <rich:column>
+ <h:outputText value="#{list.text}"/>
+ </rich:column>
</f:facet>
<f:facet name="target">
- <rich:column>
- <h:outputText value="#{list.text}"/>
- </rich:column>
- <rich:column>
- <h:outputText value="#{list.description}"/>
- </rich:column>
+ <rich:column>
+ <h:outputText value="#{item.name}" />
+ </rich:column>
+ <rich:column>
+ <h:outputText value="#{item.price}" />
+ </rich:column>
</f:facet>
<rich:listShuttle>
...]]></programlisting>
@@ -111,23 +117,29 @@
<property>"downControl" </property>
</emphasis>, <emphasis>
<property>"downControlDisabled" </property>
- </emphasis> facets are used to replaces the default control with facets content. </para>
+ </emphasis> facets are used to replaces the default control with facets content.
+ </para>
+ <para>An <property>ordering controls set</property> could be also defined with
+ <emphasis><property>"topControlLabel"</property></emphasis>, <emphasis><property>"bottomControlLabel"</property></emphasis>,
+ <emphasis><property>"upControlLabel"</property></emphasis>, <emphasis><property>"downControlLabel"</property></emphasis>attributes.
+ </para>
<para>
<emphasis role="bold">Example:</emphasis>
</para>
<programlisting role="XML"><![CDATA[...
-<rich:orderingList value="#{demoBean.items}" var="item" controlType="button">
+<rich:listShuttle var="item" sourceValue="#{bean.source}" targetValue="#{bean.target}" sourceSelection="#{bean.sourceSelection}" targetSelection="#{bean.targetSelection}">
+...
<f:facet name="topControl">
- <h:outputText value="Move to top">
+ <h:outputText value="Move to top" />
</f:facet>
<f:facet name="upControl">
- <h:outputText value="Move up">
+ <h:outputText value="Move up" />
</f:facet>
<f:facet name="downControl">
- <h:outputText value="Move down">
+ <h:outputText value="Move down" />
</f:facet>
<f:facet name="bottomControl">
- <h:outputText value="Move to bottom">
+ <h:outputText value="Move to bottom" />
</f:facet>
<rich:orderingList>
...
@@ -140,22 +152,34 @@
Every control has possibility to be disabled. </para>
<para>
<emphasis>
- <property>"copyCotrol" </property>
- </emphasis>, <emphasis>
+ <property>"copyControl" </property>
+ </emphasis>,
+ <!--<emphasis>
<property>"copy_disabled" </property>
- </emphasis>, <emphasis>
+ </emphasis>, -->
+ <emphasis>
<property>"removeControl" </property>
- </emphasis>, <emphasis>
+ </emphasis>,
+ <!--<emphasis>
<property>"remove_disabled" </property>
- </emphasis>, <emphasis>
+ </emphasis>, -->
+ <emphasis>
<property>"copyAllControl" </property>
- </emphasis>, <emphasis>
+ </emphasis>,
+ <!--<emphasis>
<property>"copyAll_disabled" </property>
- </emphasis>, <emphasis>
+ </emphasis>, -->
+ <emphasis>
<property>"removeAllControl" </property>
- </emphasis>, <emphasis>
+ </emphasis>
+ <!--<emphasis>
<property>"removeAll_disabled" </property>
- </emphasis> facets are used to replaces the default control with facets content. </para>
+ </emphasis>--> facets are used to replaces the default control with facets content.
+ </para>
+ <para>An <property>move/copy controls set</property> could be also defined with
+ <emphasis><property>"copyControlLabel"</property></emphasis>, <emphasis><property>"removeControlLabel"</property></emphasis>,
+ <emphasis><property>"copyAllControlLabel"</property></emphasis>, <emphasis><property>"removeAllControlLabel"</property></emphasis>attributes.
+ </para>
<!-- attributes -->
<para> The <emphasis>
<property>"sourceValue" </property>
@@ -166,10 +190,11 @@
<para> The <emphasis>
<property>"var" </property>
</emphasis> could be shared between both collections to defined lists on the page.</para>
- <para>Controls rendering is based on the <emphasis>
+ <!--para>Controls rendering is based on the <emphasis>
<property>"controlsType" </property>
</emphasis> attribute. Possible types are <property>button</property> and
- <property>none</property>.</para>
+ <property>none</property>.</para-->
+
<!-- template wiil be done in 3.2.0 -->
<!--para>The <emphasis role="bold">
<property><rich:listShuttle></property>
18 years, 5 months
JBoss Rich Faces SVN: r4632 - in branches/3.1.x/ui/suggestionbox/src/main: java/org/richfaces/renderkit/html and 1 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: akushunin
Date: 2007-12-08 07:48:41 -0500 (Sat, 08 Dec 2007)
New Revision: 4632
Added:
branches/3.1.x/ui/suggestionbox/src/main/java/org/richfaces/component/SelectSuggestionEvent.java
Modified:
branches/3.1.x/ui/suggestionbox/src/main/java/org/richfaces/component/UISuggestionBox.java
branches/3.1.x/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java
branches/3.1.x/ui/suggestionbox/src/main/resources/org/richfaces/renderkit/html/scripts/suggestionbox.js
Log:
RF-1363 branch merged with trunk RF-923
Added: branches/3.1.x/ui/suggestionbox/src/main/java/org/richfaces/component/SelectSuggestionEvent.java
===================================================================
--- branches/3.1.x/ui/suggestionbox/src/main/java/org/richfaces/component/SelectSuggestionEvent.java (rev 0)
+++ branches/3.1.x/ui/suggestionbox/src/main/java/org/richfaces/component/SelectSuggestionEvent.java 2007-12-08 12:48:41 UTC (rev 4632)
@@ -0,0 +1,23 @@
+package org.richfaces.component;
+
+import javax.faces.component.UIComponent;
+import javax.faces.event.FacesEvent;
+import javax.faces.event.FacesListener;
+
+public class SelectSuggestionEvent extends FacesEvent {
+
+ private static final long serialVersionUID = 1L;
+
+ public SelectSuggestionEvent(UIComponent component) {
+ super(component);
+ }
+
+ public boolean isAppropriateListener(FacesListener listener) {
+ return false;
+ }
+
+ public void processListener(FacesListener listener) {
+ throw new UnsupportedOperationException();
+ }
+
+}
Property changes on: branches/3.1.x/ui/suggestionbox/src/main/java/org/richfaces/component/SelectSuggestionEvent.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Modified: branches/3.1.x/ui/suggestionbox/src/main/java/org/richfaces/component/UISuggestionBox.java
===================================================================
--- branches/3.1.x/ui/suggestionbox/src/main/java/org/richfaces/component/UISuggestionBox.java 2007-12-07 23:30:51 UTC (rev 4631)
+++ branches/3.1.x/ui/suggestionbox/src/main/java/org/richfaces/component/UISuggestionBox.java 2007-12-08 12:48:41 UTC (rev 4632)
@@ -21,12 +21,16 @@
package org.richfaces.component;
+import java.util.Map;
+
+import javax.el.MethodExpression;
import javax.faces.component.UIData;
import javax.faces.context.FacesContext;
import javax.faces.convert.Converter;
import javax.faces.el.MethodBinding;
import javax.faces.event.AbortProcessingException;
import javax.faces.event.FacesEvent;
+import javax.faces.event.PhaseId;
import org.ajax4jsf.component.AjaxComponent;
import org.ajax4jsf.context.AjaxContext;
@@ -273,6 +277,17 @@
/* (non-Javadoc)
* @see javax.faces.component.UIData#broadcast(javax.faces.event.FacesEvent)
*/
+
+ private int rowNumber = -1;
+
+ public int getRowNumber() {
+ return rowNumber;
+ }
+
+ public void setRowNumber(int rowNumber) {
+ this.rowNumber = rowNumber;
+ }
+
public final void broadcast(final FacesEvent event)
throws AbortProcessingException {
super.broadcast(event);
@@ -285,9 +300,50 @@
AjaxContext.getCurrentInstance(context)
.renderSubmittedAjaxRegion(context, true);
}
+ } else if (event instanceof SelectSuggestionEvent) {
+ setValue(null);
}
}
+ public void queueEvent(FacesEvent event) {
+ if (event instanceof SelectSuggestionEvent) {
+ event.setPhaseId(PhaseId.RENDER_RESPONSE);
+ super.queueEvent(event);
+ } else if (event.getComponent() != this && rowNumber != -1) {
+ int prevIndex = getRowIndex();
+ setRowIndex(rowNumber);
+ super.queueEvent(event);
+ setRowIndex(prevIndex);
+ } else {
+ super.queueEvent(event);
+ }
+
+ }
+
+ public void processDecodes(FacesContext context) {
+ if (!this.isRendered())
+ return;
+ Map requestParameterMap = context.getExternalContext().getRequestParameterMap();
+ String clientId = getClientId(context);
+ String rowValue = (String)requestParameterMap.get(clientId+"_selection");
+ if (rowValue != null && rowValue.length()!=0) {
+ setRowNumber(Integer.parseInt(rowValue)+getFirst());
+ setupValue(context);
+ queueEvent(new SelectSuggestionEvent(this));
+ } else {
+ setRowNumber(-1);
+ }
+ super.processDecodes(context);
+ }
+
+ public void setupValue(FacesContext context) {
+ Object value = getSubmitedValue();
+ MethodBinding suggestingAction = getSuggestionAction();
+ if (null != suggestingAction) {
+ setValue(suggestingAction.invoke(context, new Object[]{value}));
+ }
+ }
+
public void addAjaxListener(final AjaxListener listener) {
addFacesListener(listener);
}
Modified: branches/3.1.x/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java
===================================================================
--- branches/3.1.x/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java 2007-12-07 23:30:51 UTC (rev 4631)
+++ branches/3.1.x/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java 2007-12-08 12:48:41 UTC (rev 4632)
@@ -221,6 +221,15 @@
writer.writeAttribute(
"style", "position:absolute;display:none;z-index:" + zIndex + ";", null);
writer.endElement("iframe");
+
+ writer.startElement("input", component);
+ writer.writeAttribute("type", "hidden", null);
+ writer.writeAttribute("id", component.getClientId(context)
+ + "_selection", null);
+ writer.writeAttribute("name", component.getClientId(context)
+ + "_selection", null);
+ writer.endElement("input");
+
} else {
suggestionBox.setSubmitted(false);
}
@@ -243,13 +252,7 @@
throws IOException {
UISuggestionBox suggestionBox = (UISuggestionBox) component;
if (suggestionBox.isSubmitted()) {
- Object value = suggestionBox.getSubmitedValue();
- MethodBinding suggestingAction = suggestionBox.getSuggestionAction();
- if (null != suggestingAction) {
- // TODO - use converter
- suggestionBox.setValue(suggestingAction.invoke(
- context, new Object[]{value}));
- }
+ suggestionBox.setupValue(context);
body.encode(getTemplateContext(context, suggestionBox));
// Replace rendered area ID from component to suggestion table
suggestionBox.setRowIndex(-1);
Modified: branches/3.1.x/ui/suggestionbox/src/main/resources/org/richfaces/renderkit/html/scripts/suggestionbox.js
===================================================================
--- branches/3.1.x/ui/suggestionbox/src/main/resources/org/richfaces/renderkit/html/scripts/suggestionbox.js 2007-12-07 23:30:51 UTC (rev 4631)
+++ branches/3.1.x/ui/suggestionbox/src/main/resources/org/richfaces/renderkit/html/scripts/suggestionbox.js 2007-12-08 12:48:41 UTC (rev 4632)
@@ -16,7 +16,7 @@
this.keyEvent = false;
this.oldValue = this.element.value;
this.skipHover = false;
-
+ options.selection = update + "_selection";
var needIframe = (RichFaces.navigatorType() == "MSIE");
if (needIframe) {
@@ -546,6 +546,10 @@
selectEntry: function(event) {
this.active = false;
+
+ var input = $(this.options.selection);
+ input.value = this.index;
+
this.updateElement(this.getCurrentEntry());
if (this.options.onselect) {
this.options.onselect(this, event);
@@ -553,6 +557,7 @@
if (this.update.onselect) {
this.update.onselect(this, event);
}
+ input.value = "";
},
updateElement: function(selectedElement) {
@@ -699,7 +704,7 @@
this.actionUrl = actionUrl;
if (onsubmit && onsubmit != 'null'){
- this.onsubmitFunction = new Function(onsubmit).bind(this.element);
+ this.onsubmitFunction = new Function(onsubmit+';return true;').bind(this.element);
}
return this;
18 years, 5 months
JBoss Rich Faces SVN: r4631 - in branches/3.1.x: extensions/portletbridge and 5 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: alexsmirnov
Date: 2007-12-07 18:30:51 -0500 (Fri, 07 Dec 2007)
New Revision: 4631
Modified:
branches/3.1.x/extensions/pom.xml
branches/3.1.x/extensions/portletbridge/pom.xml
branches/3.1.x/extensions/portletbridge/portletbridge-api/pom.xml
branches/3.1.x/extensions/portletbridge/portletbridge-impl/pom.xml
branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxContainerRenderer.java
branches/3.1.x/samples/ajaxPortlet/pom.xml
branches/3.1.x/samples/pom.xml
Log:
Prepare to build RF 3.1.3 release candidate 2
Modified: branches/3.1.x/extensions/pom.xml
===================================================================
--- branches/3.1.x/extensions/pom.xml 2007-12-07 22:51:31 UTC (rev 4630)
+++ branches/3.1.x/extensions/pom.xml 2007-12-07 23:30:51 UTC (rev 4631)
@@ -11,6 +11,6 @@
<name>Richfaces extensions for a different environments</name>
<packaging>pom</packaging>
<modules>
- <module>portlet</module>
+ <module>portletbridge</module>
</modules>
</project>
\ No newline at end of file
Modified: branches/3.1.x/extensions/portletbridge/pom.xml
===================================================================
--- branches/3.1.x/extensions/portletbridge/pom.xml 2007-12-07 22:51:31 UTC (rev 4630)
+++ branches/3.1.x/extensions/portletbridge/pom.xml 2007-12-07 23:30:51 UTC (rev 4631)
@@ -2,12 +2,12 @@
<parent>
<artifactId>extensions</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.1.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.extensions</groupId>
<artifactId>portletbridge</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.1.3-SNAPSHOT</version>
<name>Richfaces bridge for a portlet environment</name>
<packaging>pom</packaging>
<build>
@@ -62,7 +62,7 @@
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-test</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.1.3-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: branches/3.1.x/extensions/portletbridge/portletbridge-api/pom.xml
===================================================================
--- branches/3.1.x/extensions/portletbridge/portletbridge-api/pom.xml 2007-12-07 22:51:31 UTC (rev 4630)
+++ branches/3.1.x/extensions/portletbridge/portletbridge-api/pom.xml 2007-12-07 23:30:51 UTC (rev 4631)
@@ -4,12 +4,12 @@
<parent>
<artifactId>portletbridge</artifactId>
<groupId>org.richfaces.extensions</groupId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.1.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.extensions.portletbridge</groupId>
<artifactId>portletbridge-api</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.1.3-SNAPSHOT</version>
<name>JSR-301 jsf-portlet brige api</name>
<url>http://labs.jboss.com/wiki/Ajax4jsf/a4j-portlet</url>
<build>
Modified: branches/3.1.x/extensions/portletbridge/portletbridge-impl/pom.xml
===================================================================
--- branches/3.1.x/extensions/portletbridge/portletbridge-impl/pom.xml 2007-12-07 22:51:31 UTC (rev 4630)
+++ branches/3.1.x/extensions/portletbridge/portletbridge-impl/pom.xml 2007-12-07 23:30:51 UTC (rev 4631)
@@ -4,12 +4,12 @@
<parent>
<artifactId>portletbridge</artifactId>
<groupId>org.richfaces.extensions</groupId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.1.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.extensions.portletbridge</groupId>
<artifactId>portletbridge-impl</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.1.3-SNAPSHOT</version>
<name>ajax4jsf portlet brige implementation</name>
<url>http://labs.jboss.com/wiki/Ajax4jsf/a4j-portlet</url>
<dependencies>
@@ -22,18 +22,18 @@
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-impl</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.1.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.richfaces.extensions.portletbridge</groupId>
<artifactId>portletbridge-api</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.1.3-SNAPSHOT</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.richfaces.extensions.portletbridge</groupId>
<artifactId>portletbridge-api</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.1.3-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
Modified: branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxContainerRenderer.java
===================================================================
--- branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxContainerRenderer.java 2007-12-07 22:51:31 UTC (rev 4630)
+++ branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxContainerRenderer.java 2007-12-07 23:30:51 UTC (rev 4631)
@@ -148,8 +148,8 @@
if (log.isDebugEnabled()) {
log.debug(Messages.getMessage(
Messages.DECODE_AJAX_REQUEST_STATUS_INFO, clientId));
- log.debug(Messages.getMessage(Messages.REQUEST_PARAMETERS_MAP,
- paramMap.toString()));
+// log.debug(Messages.getMessage(Messages.REQUEST_PARAMETERS_MAP,
+// paramMap.toString()));
}
Object ajaxParameter = paramMap.get(AJAX_PARAMETER_NAME);
AjaxContainer ajaxContainer = (AjaxContainer) component;
Modified: branches/3.1.x/samples/ajaxPortlet/pom.xml
===================================================================
--- branches/3.1.x/samples/ajaxPortlet/pom.xml 2007-12-07 22:51:31 UTC (rev 4630)
+++ branches/3.1.x/samples/ajaxPortlet/pom.xml 2007-12-07 23:30:51 UTC (rev 4631)
@@ -5,12 +5,12 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.1.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.samples</groupId>
<artifactId>portalAjaxSample</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.1.3-SNAPSHOT</version>
<packaging>war</packaging>
<description>Ajax JSF sample portlet</description>
<build>
@@ -27,7 +27,7 @@
<dependency>
<groupId>org.richfaces.extensions.portletbridge</groupId>
<artifactId>portletbridge-api</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.1.3-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>javax.faces</groupId>
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.richfaces.extensions.portletbridge</groupId>
<artifactId>portletbridge-impl</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.1.3-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>javax.faces</groupId>
@@ -57,7 +57,7 @@
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.1.3-SNAPSHOT</version>
</dependency>
<!--
<dependency>
Modified: branches/3.1.x/samples/pom.xml
===================================================================
--- branches/3.1.x/samples/pom.xml 2007-12-07 22:51:31 UTC (rev 4630)
+++ branches/3.1.x/samples/pom.xml 2007-12-07 23:30:51 UTC (rev 4631)
@@ -428,9 +428,7 @@
<module>orderingListDemo</module>
<module>listShuttleDemo</module>
<module>contextMenuDemo</module>
- <!--
- <module>ajaxPortlet</module>
- -->
+ <module>ajaxPortlet</module>
<module>panelmenu-sample</module>
<module>rich-message-demo</module>
<!--
18 years, 5 months
JBoss Rich Faces SVN: r4630 - branches/3.1.x/samples.
by richfaces-svn-commits@lists.jboss.org
Author: alexsmirnov
Date: 2007-12-07 17:51:31 -0500 (Fri, 07 Dec 2007)
New Revision: 4630
Added:
branches/3.1.x/samples/ajaxPortlet/
Log:
copy portlet sample to the 3.1 branch
Copied: branches/3.1.x/samples/ajaxPortlet (from rev 4629, trunk/samples/ajaxPortlet)
18 years, 5 months
JBoss Rich Faces SVN: r4629 - branches/3.1.x/samples.
by richfaces-svn-commits@lists.jboss.org
Author: alexsmirnov
Date: 2007-12-07 17:51:16 -0500 (Fri, 07 Dec 2007)
New Revision: 4629
Removed:
branches/3.1.x/samples/ajaxPortlet/
Log:
replace portlet sample wich one from trunk
18 years, 5 months
JBoss Rich Faces SVN: r4628 - branches/3.1.x/samples/ajaxPortlet.
by richfaces-svn-commits@lists.jboss.org
Author: alexsmirnov
Date: 2007-12-07 17:47:11 -0500 (Fri, 07 Dec 2007)
New Revision: 4628
Added:
branches/3.1.x/samples/ajaxPortlet/ajaxPortlet/
Log:
copy portlet sample to the 3.1 branch
Copied: branches/3.1.x/samples/ajaxPortlet/ajaxPortlet (from rev 4627, trunk/samples/ajaxPortlet)
18 years, 5 months
JBoss Rich Faces SVN: r4627 - branches/3.1.x/extensions.
by richfaces-svn-commits@lists.jboss.org
Author: alexsmirnov
Date: 2007-12-07 17:17:30 -0500 (Fri, 07 Dec 2007)
New Revision: 4627
Added:
branches/3.1.x/extensions/portletbridge/
Log:
copy portlet bridge to branch
Copied: branches/3.1.x/extensions/portletbridge (from rev 4626, trunk/extensions/portletbridge)
18 years, 5 months
JBoss Rich Faces SVN: r4626 - in trunk/framework/impl: src/main/java/org/ajax4jsf/renderkit and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: alexsmirnov
Date: 2007-12-07 17:10:39 -0500 (Fri, 07 Dec 2007)
New Revision: 4626
Modified:
trunk/framework/impl/pom.xml
trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxContainerRenderer.java
Log:
Fix for a http://jira.jboss.com/jira/browse/RF-1564
Modified: trunk/framework/impl/pom.xml
===================================================================
--- trunk/framework/impl/pom.xml 2007-12-07 21:08:40 UTC (rev 4625)
+++ trunk/framework/impl/pom.xml 2007-12-07 22:10:39 UTC (rev 4626)
@@ -66,6 +66,49 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>net.sf.alchim</groupId>
+ <artifactId>yuicompressor-maven-plugin</artifactId>
+ <executions><!--
+ <execution>
+ <goals>
+ <goal>compress</goal>
+ </goals>
+ </execution>-->
+ </executions>
+ <configuration>
+ <nosuffix>false</nosuffix>
+ <outputDirectory>${project.build.directory}/compressed/</outputDirectory>
+ <blaBla>foo</blaBla>
+ <aggregations>
+ <aggregation>
+ <!-- remove files after aggregation (default: false)
+ <removeIncluded>true</removeIncluded>
+ -->
+ <!-- insert new line after each concatenation (default: false) -->
+ <insertNewLine>false</insertNewLine>
+ <output>${project.build.directory}/compressed/framework.pack.js</output>
+ <!-- files to include, path relative to output's directory or absolute path-->
+ <includes>
+ <include>**/*.js</include>
+ </includes>
+ <!-- files to exclude, path relative to output's directory -->
+ <excludes>
+ <exclude>**/*.pack.js</exclude>
+ <exclude>**/compressed.css</exclude>
+ </excludes>
+ </aggregation>
+ </aggregations>
+ <resources>
+ <resource>
+ <directory>target/javascript</directory>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </plugin>
</plugins>
</build>
<profiles>
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxContainerRenderer.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxContainerRenderer.java 2007-12-07 21:08:40 UTC (rev 4625)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxContainerRenderer.java 2007-12-07 22:10:39 UTC (rev 4626)
@@ -148,8 +148,8 @@
if (log.isDebugEnabled()) {
log.debug(Messages.getMessage(
Messages.DECODE_AJAX_REQUEST_STATUS_INFO, clientId));
- log.debug(Messages.getMessage(Messages.REQUEST_PARAMETERS_MAP,
- paramMap.toString()));
+// log.debug(Messages.getMessage(Messages.REQUEST_PARAMETERS_MAP,
+// paramMap.toString()));
}
Object ajaxParameter = paramMap.get(AJAX_PARAMETER_NAME);
AjaxContainer ajaxContainer = (AjaxContainer) component;
18 years, 5 months
JBoss Rich Faces SVN: r4625 - in branches/3.1.x/ui: orderingList/src/main/java/org/richfaces/renderkit and 1 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: sergeyhalipov
Date: 2007-12-07 16:08:40 -0500 (Fri, 07 Dec 2007)
New Revision: 4625
Modified:
branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss
branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java
branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss
Log:
Some CSS fixes.
Modified: branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss
===================================================================
--- branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss 2007-12-07 21:06:24 UTC (rev 4624)
+++ branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss 2007-12-07 21:08:40 UTC (rev 4625)
@@ -97,10 +97,18 @@
vertical-align: middle;
}
-a.rich-list-shuttle-button-selection:visited, a.rich-list-shuttle-button-selection:link {
+a.rich-list-shuttle-button-selection:visited,
+a.rich-list-shuttle-button-selection:link,
+a.rich-list-shuttle-button-a-disabled:visited,
+a.rich-list-shuttle-button-a-disabled:link {
color: inherit;
}
+.rich-list-shuttle-button-a-disabled {
+ cursor: default;
+ text-decoration: none;
+}
+
.rich-list-shuttle-caption {
text-align: left;
padding : 1px;
Modified: branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java
===================================================================
--- branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java 2007-12-07 21:06:24 UTC (rev 4624)
+++ branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java 2007-12-07 21:08:40 UTC (rev 4625)
@@ -317,11 +317,12 @@
}
writer.startElement(HTML.a_ELEMENT, orderingList);
- writer.writeAttribute(HTML.class_ATTRIBUTE, baseStyle + "-selection", null);
writer.writeAttribute(HTML.HREF_ATTR, "#", null);
if (!helper.enable) {
writer.writeAttribute(HTML.DISABLED_ATTR, "disabled", null);
- writer.writeAttribute(HTML.style_ATTRIBUTE, "cursor: default;", null);
+ writer.writeAttribute(HTML.class_ATTRIBUTE, baseStyle + "-a-disabled", null);
+ } else {
+ writer.writeAttribute(HTML.class_ATTRIBUTE, baseStyle + "-selection", null);
}
writer.writeAttribute(HTML.onclick_ATTRIBUTE, "return false;", null);
Modified: branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss
===================================================================
--- branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss 2007-12-07 21:06:24 UTC (rev 4624)
+++ branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss 2007-12-07 21:08:40 UTC (rev 4625)
@@ -81,12 +81,16 @@
vertical-align: middle;
}
-a.rich-ordering-list-button-selection:visited {
+a.rich-ordering-list-button-selection:visited,
+a.rich-ordering-list-button-selection:link,
+a.rich-ordering-list-button-a-disabled:visited,
+a.rich-ordering-list-button-a-disabled:link {
color: inherit;
}
-a.rich-ordering-list-button-selection:link {
- color: inherit;
+.rich-ordering-list-button-a-disabled {
+ cursor: default;
+ text-decoration: none;
}
.rich-ordering-list-caption {
18 years, 5 months