JBoss Rich Faces SVN: r13774 - in trunk/ui: orderingList/src/main/java/org/richfaces/component and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-04-22 12:51:47 -0400 (Wed, 22 Apr 2009)
New Revision: 13774
Modified:
trunk/ui/listShuttle/src/main/config/component/listShuttle.xml
trunk/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingBaseComponent.java
Log:
https://jira.jboss.org/jira/browse/RF-6794
Modified: trunk/ui/listShuttle/src/main/config/component/listShuttle.xml
===================================================================
--- trunk/ui/listShuttle/src/main/config/component/listShuttle.xml 2009-04-22 16:25:28 UTC (rev 13773)
+++ trunk/ui/listShuttle/src/main/config/component/listShuttle.xml 2009-04-22 16:51:47 UTC (rev 13774)
@@ -124,10 +124,6 @@
<property hidden="true">
<name>required</name>
</property>
- <property hidden="true">
- <name>requiredMessage</name>
- <classname>java.lang.String</classname>
- </property>
<property elonly="true">
<name>sourceSelection</name>
Modified: trunk/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingBaseComponent.java
===================================================================
--- trunk/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingBaseComponent.java 2009-04-22 16:25:28 UTC (rev 13773)
+++ trunk/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingBaseComponent.java 2009-04-22 16:51:47 UTC (rev 13774)
@@ -104,6 +104,9 @@
public abstract boolean isFastOrderControlsVisible();
public abstract void setFastOrderControlsVisible(boolean visible);
+ public abstract String getRequiredMessage();
+ public abstract void setRequiredMessage(String requiredMessage);
+
public Object saveState(FacesContext faces) {
Object[] state = new Object[4];
@@ -306,9 +309,16 @@
}
protected void requiredInvalidate(FacesContext context) {
- FacesMessage message = MessageUtil.getMessage(context, UIInput.REQUIRED_MESSAGE_ID,
- new Object[] {MessageUtil.getLabel(context, this)});
- message.setSeverity(FacesMessage.SEVERITY_ERROR);
+ String requiredMessage = getRequiredMessage();
+ FacesMessage message = null;
+
+ if (requiredMessage != null) {
+ message = new FacesMessage(FacesMessage.SEVERITY_ERROR, requiredMessage, requiredMessage);
+ } else {
+ message = MessageUtil.getMessage(context, UIInput.REQUIRED_MESSAGE_ID,
+ new Object[] {MessageUtil.getLabel(context, this)});
+ message.setSeverity(FacesMessage.SEVERITY_ERROR);
+ }
context.addMessage(getClientId(context), message);
setValid(false);
15 years, 8 months
JBoss Rich Faces SVN: r13773 - in trunk/examples/photoalbum/web/src/main: webapp/includes/index and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2009-04-22 12:25:28 -0400 (Wed, 22 Apr 2009)
New Revision: 13773
Modified:
trunk/examples/photoalbum/web/src/main/resources/messages_en.properties
trunk/examples/photoalbum/web/src/main/webapp/includes/index/menu.xhtml
Log:
realworld/ ui: Tooltips for icons on toolbar are absent
https://jira.jboss.org/jira/browse/RF-6765
Modified: trunk/examples/photoalbum/web/src/main/resources/messages_en.properties
===================================================================
--- trunk/examples/photoalbum/web/src/main/resources/messages_en.properties 2009-04-22 16:22:22 UTC (rev 13772)
+++ trunk/examples/photoalbum/web/src/main/resources/messages_en.properties 2009-04-22 16:25:28 UTC (rev 13773)
@@ -294,4 +294,4 @@
search=Search
find=Find
-my_album:\=My Album\:
\ No newline at end of file
+my_album=My Album\:
\ No newline at end of file
Modified: trunk/examples/photoalbum/web/src/main/webapp/includes/index/menu.xhtml
===================================================================
(Binary files differ)
15 years, 8 months
JBoss Rich Faces SVN: r13772 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: msorokin
Date: 2009-04-22 12:22:22 -0400 (Wed, 22 Apr 2009)
New Revision: 13772
Modified:
trunk/docs/userguide/en/src/main/docbook/included/layoutPanel.xml
Log:
https://jira.jboss.org/jira/browse/RF-6593
Updated listings
Modified: trunk/docs/userguide/en/src/main/docbook/included/layoutPanel.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/layoutPanel.xml 2009-04-22 16:12:26 UTC (rev 13771)
+++ trunk/docs/userguide/en/src/main/docbook/included/layoutPanel.xml 2009-04-22 16:22:22 UTC (rev 13772)
@@ -73,6 +73,28 @@
</para>
<para>The <emphasis><property>"position"</property></emphasis> attribute defines the position of the <emphasis role="bold"><property><rich:layoutPanel></property></emphasis> in the area created with <emphasis role="bold"><property><rich:layout></property></emphasis> .</para>
+<programlisting role="XML"><![CDATA[...
+<rich:layout>
+ <rich:layoutPanel position="top">
+ <!--top-->
+ </rich:layoutPanel>
+ <rich:layoutPanel position="left">
+ <!--left-->
+ </rich:layoutPanel>
+ <rich:layoutPanel position="center">
+ <!--center-->
+ </rich:layoutPanel>
+ <rich:layoutPanel position="right">
+ <!--right-->
+ </rich:layoutPanel>
+ <rich:layoutPanel position="bottom">
+ <!--bottom-->
+ </rich:layoutPanel>
+</rich:layout>
+...]]></programlisting>
+
+
+
<para>In more detail the component is covered in the <link linkend="DofURichLayout"><emphasis role="bold"><property><rich:layout></property></emphasis></link>.</para>
</section>
15 years, 8 months
JBoss Rich Faces SVN: r13771 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: msorokin
Date: 2009-04-22 12:12:26 -0400 (Wed, 22 Apr 2009)
New Revision: 13771
Modified:
trunk/docs/userguide/en/src/main/docbook/included/layout.xml
trunk/docs/userguide/en/src/main/docbook/included/layoutPanel.xml
trunk/docs/userguide/en/src/main/docbook/included/rich_page.xml
Log:
https://jira.jboss.org/jira/browse/RF-6593
Updated listings
Modified: trunk/docs/userguide/en/src/main/docbook/included/layout.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/layout.xml 2009-04-22 15:56:50 UTC (rev 13770)
+++ trunk/docs/userguide/en/src/main/docbook/included/layout.xml 2009-04-22 16:12:26 UTC (rev 13771)
@@ -84,21 +84,21 @@
<programlisting role="XML"><![CDATA[...
<rich:layout>
- <rich:layoutPanel position="top">
- <!--top-->
- </rich:layoutPanel>
- <rich:layoutPanel position="left">
- <!--left-->
- </rich:layoutPanel>
- <rich:layoutPanel position="center">
- <!--center-->
- </rich:layoutPanel>
- <rich:layoutPanel position="right">
- <!--right-->
- </rich:layoutPanel>
- <rich:layoutPanel position="bottom">
- <!--bottom-->
- </rich:layoutPanel>
+ <rich:layoutPanel position="top">
+ <!--top-->
+ </rich:layoutPanel>
+ <rich:layoutPanel position="left">
+ <!--left-->
+ </rich:layoutPanel>
+ <rich:layoutPanel position="center">
+ <!--center-->
+ </rich:layoutPanel>
+ <rich:layoutPanel position="right">
+ <!--right-->
+ </rich:layoutPanel>
+ <rich:layoutPanel position="bottom">
+ <!--bottom-->
+ </rich:layoutPanel>
</rich:layout>
...]]></programlisting>
@@ -118,13 +118,13 @@
<programlisting role="XML"><![CDATA[...<rich:layout>
- <rich:layoutPanel position="left">
- <!--left-->
- </rich:layoutPanel>
- <rich:layoutPanel position="center">
- <!--center-->
- </rich:layoutPanel>
- </rich:layout>
+<rich:layoutPanel position="left">
+ <!--left-->
+</rich:layoutPanel>
+<rich:layoutPanel position="center">
+ <!--center-->
+</rich:layoutPanel>
+</rich:layout>
...]]></programlisting>
Modified: trunk/docs/userguide/en/src/main/docbook/included/layoutPanel.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/layoutPanel.xml 2009-04-22 15:56:50 UTC (rev 13770)
+++ trunk/docs/userguide/en/src/main/docbook/included/layoutPanel.xml 2009-04-22 16:12:26 UTC (rev 13771)
@@ -68,7 +68,7 @@
<section>
<title>Details of Usage</title>
<para>The <emphasis role="bold">
- <property><layoutPanel></property>
+ <property><rich:layoutPanel></property>
</emphasis> component is used to split the area inside the <emphasis role="bold"><property><rich:layout></property></emphasis> into up to 5 parts: top, left, center, right, bottom.
</para>
Modified: trunk/docs/userguide/en/src/main/docbook/included/rich_page.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/rich_page.xml 2009-04-22 15:56:50 UTC (rev 13770)
+++ trunk/docs/userguide/en/src/main/docbook/included/rich_page.xml 2009-04-22 16:12:26 UTC (rev 13771)
@@ -102,14 +102,15 @@
</para>
<programlisting role="XML"><![CDATA[...
-<rich:page pageTitle="The title of the page" markupType="xhtml" contentType="text/html; charset=utf-8" >
- <f:facet name="pageHeader" >
- <meta content="The rich:page component" name="keywords" />
- <link rel="shortcut icon" href="/images/favicon.ico"/>
- <link href="/css/style.css" rel="stylesheet" type="text/css" />
- <script type="text/javascript" src="/js/menu.js"></script>
- </f:facet>
- <!-- page content -->
+<rich:page pageTitle="The title of the page" markupType="xhtml"
+ contentType="text/html; charset=utf-8">
+ <f:facet name="pageHeader">
+ <meta content="The rich:page component" name="keywords" />
+ <link rel="shortcut icon" href="/images/favicon.ico" />
+ <link href="/css/style.css" rel="stylesheet" type="text/css" />
+ <script type="text/javascript" src="/js/menu.js"></script>
+ </f:facet>
+ <!-- page content -->
</rich:page>
...]]></programlisting>
@@ -123,17 +124,17 @@
<programlisting role="XML"><![CDATA[...
<rich:page sidebarPosition="left" sidebarWidth="300">
- <f:facet name="header" >
- <!-- header content -->
- </f:facet>
- <f:facet name="sidebar">
- <!-- side panel content -->
- </f:facet>
- <!-- body content -->
- <f:facet name="footer">
- <!-- footer content -->
- </f:facet>
- </rich:page>
+ <f:facet name="header">
+ <!-- header content -->
+ </f:facet>
+ <f:facet name="sidebar">
+ <!-- side panel content -->
+ </f:facet>
+ <!-- body content -->
+ <f:facet name="footer">
+ <!-- footer content -->
+ </f:facet>
+</rich:page>
...]]></programlisting>
15 years, 8 months
JBoss Rich Faces SVN: r13770 - trunk/ui/layout/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: msorokin
Date: 2009-04-22 11:56:50 -0400 (Wed, 22 Apr 2009)
New Revision: 13770
Modified:
trunk/ui/layout/src/main/config/component/page.xml
Log:
https://jira.jboss.org/jira/browse/RF-6593
added descriptions for the component attributes
Modified: trunk/ui/layout/src/main/config/component/page.xml
===================================================================
--- trunk/ui/layout/src/main/config/component/page.xml 2009-04-22 15:17:25 UTC (rev 13769)
+++ trunk/ui/layout/src/main/config/component/page.xml 2009-04-22 15:56:50 UTC (rev 13770)
@@ -76,7 +76,7 @@
<property>
<name>theme</name>
<classname>java.lang.String</classname>
- <description><![CDATA[ ]]></description>
+ <description><![CDATA[ Specifies the way of the component rendering ]]></description>
</property>
<property>
<name>contentType</name>
@@ -96,12 +96,14 @@
<name>width</name>
<classname>int</classname>
<description>
+ Sets the width of the page
</description>
</property>
<property>
<name>sidebarWidth</name>
<classname>int</classname>
<description>
+ Defines width for the side panel. Default value is "160".
</description>
<defaultvalue>160</defaultvalue>
</property>
@@ -109,6 +111,7 @@
<name>sidebarPosition</name>
<classname>java.lang.String</classname>
<description>
+ Defines the position of the side panel. Possible values are "left", "right". Default value is "left".
</description>
</property>
@@ -116,24 +119,28 @@
<name>headerClass</name>
<classname>java.lang.String</classname>
<description>
+ A name of CSS class for the header
</description>
</property>
<property>
<name>footerClass</name>
<classname>java.lang.String</classname>
<description>
+ A name of CSS class for the footer
</description>
</property>
<property>
<name>bodyClass</name>
<classname>java.lang.String</classname>
<description>
+ A name of CSS class for the body part of the page
</description>
</property>
<property>
<name>sidebarClass</name>
<classname>java.lang.String</classname>
<description>
+ A name of CSS class for the side panel
</description>
</property>
<!--
15 years, 8 months
JBoss Rich Faces SVN: r13769 - trunk/docs/realworld_app_guide/en/src/main/docbook/modules.
by richfaces-svn-commits＠lists.jboss.org
Author: smukhina
Date: 2009-04-22 11:17:25 -0400 (Wed, 22 Apr 2009)
New Revision: 13769
Modified:
trunk/docs/realworld_app_guide/en/src/main/docbook/modules/application_overview.xml
trunk/docs/realworld_app_guide/en/src/main/docbook/modules/hiw.xml
Log:
https://jira.jboss.org/jira/browse/RF-398 English is checked and corrected in 2 chapters for Photo Album Tutorial
Modified: trunk/docs/realworld_app_guide/en/src/main/docbook/modules/application_overview.xml
===================================================================
--- trunk/docs/realworld_app_guide/en/src/main/docbook/modules/application_overview.xml 2009-04-22 14:59:53 UTC (rev 13768)
+++ trunk/docs/realworld_app_guide/en/src/main/docbook/modules/application_overview.xml 2009-04-22 15:17:25 UTC (rev 13769)
@@ -8,7 +8,7 @@
</keywordset>
</chapterinfo>
- <title>Application overview</title>
+ <title>Application Overview</title>
<section><title>Used technologies</title>
<para>
@@ -44,7 +44,7 @@
</para>
<figure>
- <title>Thе Photo Album Demo Entity Relation Diagram</title>
+ <title>The Photo Album Demo Entity Relation Diagram</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/erd.png"/>
@@ -185,7 +185,7 @@
</programlisting>
<para>The snippet above shows that the <code>index.xhtml</code> page does not contain sources for application functional parts but includes them as templates that are rendered depending on conditions and events taking place during user interaction with the Photo Album Demo.
- The illustration below shows <code>index.xhtml</code> page schematically with it "includes" and paths to them:</para>
+ The illustration below shows <code>index.xhtml</code> page schematically with all its "includes" and paths to them:</para>
<mediaobject>
<imageobject>
<imagedata fileref="images/indexxhtml.png"/>
Modified: trunk/docs/realworld_app_guide/en/src/main/docbook/modules/hiw.xml
===================================================================
--- trunk/docs/realworld_app_guide/en/src/main/docbook/modules/hiw.xml 2009-04-22 14:59:53 UTC (rev 13768)
+++ trunk/docs/realworld_app_guide/en/src/main/docbook/modules/hiw.xml 2009-04-22 15:17:25 UTC (rev 13769)
@@ -10,7 +10,7 @@
<title>How it works</title>
<section>
- <title>Used components</title>
+ <title>Used Components</title>
<para>Below there is a list of components used in <property>Photo Album Demo</property>.</para>
<table>
@@ -33,11 +33,11 @@
</row>
<row>
<entry>a4j:push</entry>
- <entry>The component periodically perform Ajax request to server, to simulate 'push' data.</entry>
+ <entry>The component periodically perform Ajax request to the server, to simulate 'push' data.</entry>
</row>
<row>
<entry>a4J:poll</entry>
- <entry>The component allows periodical sending of Ajax requests to a server and is used for a page updating according to a specified time interval.</entry>
+ <entry>The component allows periodical sending of Ajax requests to the server and is used for a page updating according to a specified time interval.</entry>
</row>
<row>
<entry>rich:calendar</entry>
@@ -45,7 +45,7 @@
</row>
<row>
<entry>rich:contextMenu</entry>
- <entry>The component is used for creation multileveled context menus that are activated after a user defines an event ("onmouseover", "onclick", etc.) on any element on the page.</entry>
+ <entry>The component is used for creation of multileveled context menus that are activated after a user defines an event ("onmouseover", "onclick", etc.) on any element on the page.</entry>
</row>
<row>
<entry>rich:dataGrid</entry>
@@ -53,11 +53,11 @@
</row>
<row>
<entry>rich:datascroller</entry>
- <entry>The component designed for providing the functionality of tables scrolling using Ajax requests.</entry>
+ <entry>The component is designed for providing the functionality of tables scrolling using Ajax requests.</entry>
</row>
<row>
<entry>rich:fileUpload</entry>
- <entry>The component designed to perform Ajax-ed files upload to server.</entry>
+ <entry>The component is designed to perform Ajax-ed files upload to the server.</entry>
</row>
<row>
<entry>rich:inplaceInput</entry>
@@ -65,7 +65,7 @@
</row>
<row>
<entry>rich:inplaceSelect</entry>
- <entry>The component is used for creation select based inputs: it shows the value as text in one state and enables editing the value, providing a list of options in another state.</entry>
+ <entry>The component is used to create select based inputs: it shows the value as text in one state and enables editing the value, providing a list of options in another state.</entry>
</row>
<row>
<entry>rich:mediaOutput</entry>
@@ -73,7 +73,7 @@
</row>
<row>
<entry>rich:modalPanel</entry>
- <entry>The component implements a modal dialog window. All operations in the main application window are locked out while this window is active. Opening and closing the window is done through client JavaScript code.</entry>
+ <entry>The component implements a modal dialog window. All operations in the main application window are locked out while this window is active. Opening and closing the window is done with client JavaScript code.</entry>
</row>
<row>
<entry>rich:progressBar</entry>
@@ -91,7 +91,7 @@
</section>
<section>
- <title>Albums representation</title>
+ <title>Albums Representation</title>
<section>
<title>Building the <rich:tree> on the page</title>
@@ -102,18 +102,18 @@
<para>
The <emphasis role="bold"><property><rich:tree></property></emphasis> component in the <property>Photo Album Demo</property> application helps to represent and implement inherently the "Shelves—Albums—Photos" hierarchy.
Shelf is the highest possible level in the tree hierarchy.
- Shelfs are used to group thematic albums and may contain as many albums as needed.
+ shelves are used to group thematic albums and may contain as many albums as needed.
Photos are not represented in the tree because it can be a great number of them and it can make a tree clumsy.
Photos are rendered in the center of the screen (hereinafter referred to as a watching area).
</para>
<para>
- Implicitly, the <emphasis role="bold"><property><rich:tree></property></emphasis> component takes one the main place in the <property>Photo Album Demo</property> and is tightly bounded with the application logic.
+ Implicitly, the <emphasis role="bold"><property><rich:tree></property></emphasis> component takes one of the main places in the <property>Photo Album Demo</property> and is tightly bounded with the application logic.
There are several ways to implement the <emphasis role="bold"><property><rich:tree></property></emphasis>.
In the current application the <emphasis role="bold"><property><rich:tree></property></emphasis> is designed using a model tag <emphasis role="bold"><property><rich:treeNodesAdaptor></property></emphasis>.
</para>
<para>
- The <emphasis role="bold"><property><rich:treeNodesAdaptor></property></emphasis> component accepts a collection of elements, which are allowed to include lists, arrays, maps, XML NodeList or NamedNodeMap, and iterates through it.
+ The <emphasis role="bold"><property><rich:treeNodesAdaptor></property></emphasis> component accepts a collection of elements, which are allowed to include lists, arrays, maps, XML NodeList or NamedNodeMap, and iterate over it.
The <emphasis role="bold"><property><rich:treeNodesAdaptor></property></emphasis> component repeats a hierarchical tree structure on a <code>xhtml</code> or <code>jsp</code> page in a component tree and can be nested without any limitations.
The code snippet below schematically shows the idea of how a tree can be built on a page with the help of adaptors:
</para>
@@ -141,10 +141,10 @@
</para>
<para>
- Implementation of the <emphasis role="bold"><property><rich:tree></property></emphasis> in the application is very close to the model shown above.
+ Implementation of the <emphasis role="bold"><property><rich:tree></property></emphasis> in the application is very similar to the model shown above.
The <emphasis role="bold"><property><rich:treeNodesAdaptor></property></emphasis> component has <nodes> attribute.
- The top <emphasis role="bold"><property><rich:treeNodesAdaptor></property></emphasis> in the <emphasis role="bold"><property><rich:tree></property></emphasis> in the Phot Album Demo application is responsible for shelfs rendering.
- Its <emphasis><property>"nodes"</property></emphasis> attribute refers to <emphasis><property>getShelfs()</property></emphasis> method of the <code>ShelfManager</code> class and gets the collection of shelfs associated with the current user including all shared shelfs in the system.
+ The top <emphasis role="bold"><property><rich:treeNodesAdaptor></property></emphasis> in the <emphasis role="bold"><property><rich:tree></property></emphasis> in the Phot Album Demo application is responsible for shelves rendering.
+ Its <emphasis><property>"nodes"</property></emphasis> attribute refers to <emphasis><property>getShelfs()</property></emphasis> method of the <code>ShelfManager</code> class and gets the collection of shelves associated with the current user including all shared shelves in the system.
Take a look at this method:
</para>
15 years, 8 months
JBoss Rich Faces SVN: r13768 - in trunk/ui: pickList/src/main/java/org/richfaces/renderkit and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-04-22 10:59:53 -0400 (Wed, 22 Apr 2009)
New Revision: 13768
Modified:
trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleRendererBase.java
trunk/ui/pickList/src/main/java/org/richfaces/renderkit/PickListRenderer.java
Log:
https://jira.jboss.org/jira/browse/RF-6784
Modified: trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleRendererBase.java
===================================================================
--- trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleRendererBase.java 2009-04-22 14:53:57 UTC (rev 13767)
+++ trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleRendererBase.java 2009-04-22 14:59:53 UTC (rev 13768)
@@ -248,6 +248,8 @@
public void encodeShuttleControlsFacets(FacesContext context, UIOrderingBaseComponent component,
SelectionState sourceSelectionState, SelectionState targetSelectionState)
throws IOException {
+
+ boolean needsStrut = true;
String clientId = component.getClientId(context);
ResponseWriter writer = context.getResponseWriter();
@@ -269,11 +271,18 @@
}
if (SHUTTLE_HELPERS[i].isRendered(context, component)) {
+ needsStrut = false;
+
//proper assumption about helpers ordering
encodeControlFacet(context, component, SHUTTLE_HELPERS[i], clientId, writer, enabled,
"rich-list-shuttle-button", " rich-shuttle-control");
}
}
+
+ if (needsStrut) {
+ writer.startElement(HTML.SPAN_ELEM, component);
+ writer.endElement(HTML.SPAN_ELEM);
+ }
}
public void encodeTLControlsFacets(FacesContext context, UIOrderingBaseComponent component, SelectionState selectionState)
Modified: trunk/ui/pickList/src/main/java/org/richfaces/renderkit/PickListRenderer.java
===================================================================
--- trunk/ui/pickList/src/main/java/org/richfaces/renderkit/PickListRenderer.java 2009-04-22 14:53:57 UTC (rev 13767)
+++ trunk/ui/pickList/src/main/java/org/richfaces/renderkit/PickListRenderer.java 2009-04-22 14:59:53 UTC (rev 13768)
@@ -482,6 +482,8 @@
}
public void encodePickListControlsFacets(FacesContext context, UIComponent component, ListStateFlags listStateFlags) throws IOException {
+ boolean needsStrut = true;
+
String clientId = component.getClientId(context);
boolean enable = false;
@@ -491,6 +493,8 @@
for (int i = 0; i < SHUTTLE_HELPERS.length; i++) {
//Conditionally render the control based on the return value of the control's corresponding helper.isRendered method
if (SHUTTLE_HELPERS[i].isRendered(context, component)){
+ needsStrut = false;
+
OrderingComponentRendererBase.ControlsHelper helper = SHUTTLE_HELPERS[i];
boolean isDisabled = helper.getButtonStyleClass().equals(PickListControlsHelper.DISABLED_STYLE_PREF);
@@ -519,6 +523,10 @@
}
}
+ if (needsStrut) {
+ writer.startElement(HTML.SPAN_ELEM, component);
+ writer.endElement(HTML.SPAN_ELEM);
+ }
}
protected void encodeControlFacet(FacesContext context, UIComponent component, OrderingComponentRendererBase.ControlsHelper helper, String clientId,
15 years, 8 months
JBoss Rich Faces SVN: r13767 - trunk/test-applications/jsp/src/main/webapp/Tooltip.
by richfaces-svn-commits＠lists.jboss.org
Author: adubovsky
Date: 2009-04-22 10:53:57 -0400 (Wed, 22 Apr 2009)
New Revision: 13767
Modified:
trunk/test-applications/jsp/src/main/webapp/Tooltip/Tooltip.jsp
Log:
JS is corrected
Modified: trunk/test-applications/jsp/src/main/webapp/Tooltip/Tooltip.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Tooltip/Tooltip.jsp 2009-04-22 14:44:47 UTC (rev 13766)
+++ trunk/test-applications/jsp/src/main/webapp/Tooltip/Tooltip.jsp 2009-04-22 14:53:57 UTC (rev 13767)
@@ -16,10 +16,10 @@
<h:panelGrid columns="2">
<h:outputText value="JavaScript API"></h:outputText>
<h:column></h:column>
- <a4j:commandLink onclick="$('formID:tooltipSubviewID:toolTipID').component.doShow(event)" value="doShow"></a4j:commandLink>
- <a4j:commandLink onclick="$('formID:tooltipSubviewID:toolTipID').component.doHide(event)" value="doHide"></a4j:commandLink>
- <a4j:commandLink onclick="$('formID:tooltipSubviewID:toolTipID').component.doEnable" value="doEnable"></a4j:commandLink>
- <a4j:commandLink onclick="$('formID:tooltipSubviewID:toolTipID').component.doDisable" value="doDisable"></a4j:commandLink>
+ <a4j:commandLink onclick="$('formID:tooltipSubviewID:toolTipID').component.show(event); return false;" value="doShow"></a4j:commandLink>
+ <a4j:commandLink onclick="$('formID:tooltipSubviewID:toolTipID').component.hide(event); return false;" value="doHide"></a4j:commandLink>
+ <a4j:commandLink onclick="$('formID:tooltipSubviewID:toolTipID').component.enable(); return false;" value="doEnable"></a4j:commandLink>
+ <a4j:commandLink onclick="$('formID:tooltipSubviewID:toolTipID').component.disable(); return false;" value="doDisable"></a4j:commandLink>
</h:panelGrid>
<h:selectOneListbox value="1" id="ddl">
<rich:toolTip value="1231231" layout="block">
15 years, 8 months
JBoss Rich Faces SVN: r13766 - trunk/docs/userguide/en/src/main/docbook.
by richfaces-svn-commits＠lists.jboss.org
Author: msorokin
Date: 2009-04-22 10:44:47 -0400 (Wed, 22 Apr 2009)
New Revision: 13766
Modified:
trunk/docs/userguide/en/src/main/docbook/master.xml
Log:
Added layout components
Modified: trunk/docs/userguide/en/src/main/docbook/master.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/master.xml 2009-04-22 14:43:05 UTC (rev 13765)
+++ trunk/docs/userguide/en/src/main/docbook/master.xml 2009-04-22 14:44:47 UTC (rev 13766)
@@ -59,6 +59,8 @@
<!ENTITY beanValidator_table SYSTEM "../../../target/generated/beanValidator.xml">
<!ENTITY editor_table SYSTEM "../../../target/generated/editor.xml">
<!ENTITY colorPicker_table SYSTEM "../../../target/generated/colorPicker.xml">
+ <!ENTITY layout_table SYSTEM "../../../target/generated/layout.xml">
+
]>
<book>
<bookinfo>
@@ -128,6 +130,7 @@
&inputNumberSpinner_table;
&insert_table;
&jQuery_table;
+&layout_table;
&listShuttle_table;
&message_table;
&modalPanel_table;
15 years, 8 months
JBoss Rich Faces SVN: r13765 - trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-04-22 10:43:05 -0400 (Wed, 22 Apr 2009)
New Revision: 13765
Modified:
trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselectlist.js
Log:
https://jira.jboss.org/jira/browse/RF-6896
Modified: trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselectlist.js
===================================================================
--- trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselectlist.js 2009-04-22 14:32:52 UTC (rev 13764)
+++ trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselectlist.js 2009-04-22 14:43:05 UTC (rev 13765)
@@ -2,7 +2,7 @@
Richfaces.InplaceSelectList = Class.create(Richfaces.ComboBoxList, {
initialize : function($super, listId, parentListId, selectFirstOnUpdate, userStyles, commonStyles, width, height, itemsText, onlistcall, fieldId, shadowId, showDelay, hideDelay, value) {
this.classes = Richfaces.mergeStyles(userStyles, commonStyles);
- $super(listId, parentListId, selectFirstOnUpdate, null, this.classes, width, height, itemsText, onlistcall, fieldId, shadowId, showDelay, hideDelay);
+ $super(listId, parentListId, selectFirstOnUpdate, null, this.classes, width, height, itemsText, onlistcall, null /* onlistclose */, fieldId, shadowId, showDelay, hideDelay);
this.wrappingItems(value);
this.isListOpened = false;
},
15 years, 8 months