JBoss Rich Faces SVN: r2985 - trunk/framework/impl/src/main/javascript/ajaxjsf.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2007-09-18 18:21:29 -0400 (Tue, 18 Sep 2007)
New Revision: 2985
Modified:
trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
Log:
fix page update error
Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
===================================================================
--- trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2007-09-18 17:31:32 UTC (rev 2984)
+++ trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2007-09-18 22:21:29 UTC (rev 2985)
@@ -821,11 +821,6 @@
var oDomDoc = (new DOMParser()).parseFromString(req.getResponseText(), "text/xml");
if(Sarissa.getParseErrorText(oDomDoc) == Sarissa.PARSED_OK){
LOG.debug("response has parsed as DOM documnet.");
-
- if (typeof Event != "undefined") {
- Event.unloadElementsCache();
- }
-
Sarissa.clearChildNodes(window.document.documentElement);
var docNodes = oDomDoc.documentElement.childNodes;
for(var i = 0;i<docNodes.length;i++){
@@ -835,6 +830,9 @@
window.document.documentElement.appendChild(node);
}
}
+ if (typeof Event != "undefined" && typeof Event.unloadElementsCache == "function") {
+ Event.unloadElementsCache();
+ }
} else {
LOG.error("Error parsing response",Sarissa.getParseErrorText(oDomDoc));
}
18 years, 7 months
JBoss Rich Faces SVN: r2984 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: vkorluzhenko
Date: 2007-09-18 13:31:32 -0400 (Tue, 18 Sep 2007)
New Revision: 2984
Modified:
trunk/docs/userguide/en/src/main/docbook/included/calendar.xml
trunk/docs/userguide/en/src/main/docbook/included/dataTable.xml
trunk/docs/userguide/en/src/main/docbook/included/datascroller.xml
trunk/docs/userguide/en/src/main/docbook/included/dropDownMenu.xml
trunk/docs/userguide/en/src/main/docbook/included/menuGroup.xml
trunk/docs/userguide/en/src/main/docbook/included/menuItem.xml
Log:
http://jira.jboss.com/jira/browse/RF-920 - changed titles, headers and content of the tables (for skins and classes)
Modified: trunk/docs/userguide/en/src/main/docbook/included/calendar.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/calendar.xml 2007-09-18 15:08:21 UTC (rev 2983)
+++ trunk/docs/userguide/en/src/main/docbook/included/calendar.xml 2007-09-18 17:31:32 UTC (rev 2984)
@@ -456,7 +456,7 @@
</table>
<table>
- <title>Skin parameters redefinition for header elements (header, optional header)</title>
+ <title>Skin parameters redefinition for headers (header, optional header)</title>
<tgroup cols="2">
<thead>
@@ -497,7 +497,7 @@
</table>
<table>
- <title>Skin parameters redefinition for footer elements (footer, optional footer) and names of working days</title>
+ <title>Skin parameters redefinition for footers (footer, optional footer) and names of working days</title>
<tgroup cols="2">
<thead>
@@ -788,6 +788,8 @@
<section>
<title>Definition of Custom Style Classes</title>
+ <para>On the screenshot there are classes names that define styles for component elements.</para>
+
<figure>
<title>Style classes</title>
@@ -798,8 +800,6 @@
</mediaobject>
</figure>
- <para>On the screenshot, there are classes names defining specified elements.</para>
-
<table>
<title>Classes names that define an input field and a button appearance</title>
Modified: trunk/docs/userguide/en/src/main/docbook/included/dataTable.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/dataTable.xml 2007-09-18 15:08:21 UTC (rev 2983)
+++ trunk/docs/userguide/en/src/main/docbook/included/dataTable.xml 2007-09-18 17:31:32 UTC (rev 2984)
@@ -126,7 +126,10 @@
</section>
<section>
- <title>Definition custom Style Classes</title>
+ <title>Definition of Custom Style Classes</title>
+
+ <para>On the screenshot there are classes names that define styles for component elements.</para>
+
<figure>
<title>DataTable class names</title>
<mediaobject>
@@ -135,65 +138,64 @@
</imageobject>
</mediaobject>
</figure>
- <para>On the screenshot there are class names defining the marked elements.</para>
-
+
<table>
- <title>Component skin classes</title>
+ <title>Classes names that define a table appearance</title>
<tgroup cols="2">
<thead>
<row>
<entry>Class name</entry>
- <entry>An element defined with a class</entry>
+ <entry>Description</entry>
</row>
</thead>
<tbody>
<row>
<entry>rich-table</entry>
- <entry>Applied to the <emphasis><property>"table"</property></emphasis> element</entry>
+ <entry>Defines styles for all table</entry>
</row>
<row>
<entry>rich-table-caption</entry>
- <entry>Applied to facet="caption"</entry>
+ <entry>Defines styles for a "caption" facet element</entry>
</row>
<row>
<entry>rich-table-header</entry>
- <entry>Applied to a whole header "header"</entry>
+ <entry>Defines styles for a table header row</entry>
</row>
<row>
<entry>rich-table-headercell</entry>
- <entry>Applied to a particular cell of a header "header"</entry>
+ <entry>Defines styles for a header cell</entry>
</row>
<row>
<entry>rich-table-subheader</entry>
- <entry>Applied to the whole subheader "header"</entry>
+ <entry>Defines styles for a column header</entry>
</row>
<row>
<entry>rich-table-subheadercell</entry>
- <entry>Applied to a particular cell of subheader "header"</entry>
+ <entry>Defines styles for a column header cell</entry>
</row>
<row>
<entry>rich-table-cell</entry>
- <entry> Applied to a particular table cell</entry>
+ <entry>Defines styles for a table cell</entry>
</row>
<row>
<entry>rich-table-row</entry>
- <entry>Applied to the whole table row</entry>
+ <entry>Defines styles for a table row</entry>
</row>
<row>
<entry>rich-table-subfooter</entry>
- <entry>Applied to the whole subheader "footer"</entry>
+ <entry>Defines styles for a column footer</entry>
</row>
<row>
<entry>rich-table-subfootercell</entry>
- <entry>Applied to a particular subheader "footer"</entry>
+ <entry>Defines styles for a column footer cell</entry>
</row>
<row>
<entry>rich-table-footer</entry>
- <entry>Applied to the whole "footer"</entry>
+ <entry>Defines styles for a footer row</entry>
</row>
<row>
- <entry>rich-table- footercell</entry>
- <entry>Applied to the specific of "footer"</entry>
+ <entry>rich-table-footercell</entry>
+ <entry>Defines styles for a footer cell</entry>
</row>
</tbody>
</tgroup>
Modified: trunk/docs/userguide/en/src/main/docbook/included/datascroller.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/datascroller.xml 2007-09-18 15:08:21 UTC (rev 2983)
+++ trunk/docs/userguide/en/src/main/docbook/included/datascroller.xml 2007-09-18 17:31:32 UTC (rev 2984)
@@ -330,7 +330,9 @@
<section>
<title>Definition of Custom Style Classes</title>
-
+
+ <para>On the screenshot there are classes names that define styles for component elements.</para>
+
<figure>
<title>Style classes</title>
<mediaobject>
@@ -340,8 +342,6 @@
</mediaobject>
</figure>
- <para>On the screenshot, there are classes names that define specified elements.</para>
-
<table>
<title>Classes names that define a component appearance</title>
<tgroup cols="2">
Modified: trunk/docs/userguide/en/src/main/docbook/included/dropDownMenu.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/dropDownMenu.xml 2007-09-18 15:08:21 UTC (rev 2983)
+++ trunk/docs/userguide/en/src/main/docbook/included/dropDownMenu.xml 2007-09-18 17:31:32 UTC (rev 2984)
@@ -319,12 +319,12 @@
<title> Skin parameters redefinition</title>
<table>
- <title>Label Skin parameters redefinition</title>
+ <title>Skin parameters redefinition for a label <div> element</title>
<tgroup cols="2">
<thead>
<row>
- <entry>Skin parameters for label div element</entry>
+ <entry>Skin parameters</entry>
<entry>CSS properties</entry>
</row>
@@ -347,12 +347,12 @@
</table>
<table>
- <title>Label Skin parameters redefinition</title>
+ <title>Skin parameters redefinition for a selected label</title>
<tgroup cols="2">
<thead>
<row>
- <entry>Skin parameters for selected label element</entry>
+ <entry>Skin parameters</entry>
<entry>CSS properties</entry>
</row>
@@ -381,12 +381,12 @@
</table>
<table>
- <title>Popup Skin parameters redefinition</title>
+ <title>Skin parameters redefinition for a border</title>
<tgroup cols="2">
<thead>
<row>
- <entry>Skin parameters for border element</entry>
+ <entry>Skin parameters</entry>
<entry>CSS properties</entry>
</row>
@@ -409,12 +409,12 @@
</table>
<table>
- <title>Popup Skin parameters redefinition</title>
+ <title>Skin parameters redefinition for a background</title>
<tgroup cols="2">
<thead>
<row>
- <entry>Skin parameters for background element</entry>
+ <entry>Skin parameters</entry>
<entry>CSS properties</entry>
</row>
@@ -446,7 +446,7 @@
<section>
<title>Definition of Custom Style Classes</title>
- <para>In the screenshot, there are classes names that define the element label.</para>
+ <para>On the screenshot there are classes names that define styles for component elements.</para>
<figure>
<title>Classes names</title>
@@ -459,7 +459,7 @@
</figure>
<table>
- <title>Classes names that define element label</title>
+ <title>Classes names that define a label</title>
<tgroup cols="2">
<thead>
@@ -472,35 +472,35 @@
<tbody>
<row>
- <entry>Rich-label-text-decor</entry>
+ <entry>rich-label-text-decor</entry>
- <entry>Defines the text style of a representation element</entry>
+ <entry>Defines text style for a representation element</entry>
</row>
<row>
- <entry>Rich-ddmenu-label</entry>
+ <entry>rich-ddmenu-label</entry>
- <entry>Defines the class for wrapping div element of a representation element</entry>
+ <entry>Defines styles for a wrapper <div> element of a representation element</entry>
</row>
<row>
- <entry>Rich-ddmenu-label-select</entry>
+ <entry>rich-ddmenu-label-select</entry>
- <entry>Defines the class for wrapping div element of the selected representation
+ <entry>Defines styles for a wrapper <div> element of a selected representation
element</entry>
</row>
<row>
- <entry>Rich-ddmenu-label-unselect</entry>
+ <entry>rich-ddmenu-label-unselect</entry>
- <entry>Defines the class for wrapping div element of a representation element that isn't
- selected</entry>
+ <entry>Defines styles for a wrapper <div> element of a unselected representation
+ element </entry>
</row>
</tbody>
</tgroup>
</table>
- <para>In the screenshot, there are classes names that define an element pop-up.</para>
+ <para>On the screenshot there are classes names that define styles for component elements.</para>
<figure>
<title>Classes names</title>
@@ -511,9 +511,9 @@
</imageobject>
</mediaobject>
</figure>
-
+
<table>
- <title>Classes names that define element popup</title>
+ <title>Classes names that define a popup element</title>
<tgroup cols="2">
<thead>
@@ -526,15 +526,15 @@
<tbody>
<row>
- <entry>Rich-menu-list-border</entry>
+ <entry>rich-menu-list-border</entry>
- <entry>Defines a class for borders elements</entry>
+ <entry>Defines styles for borders</entry>
</row>
<row>
- <entry>Rich-menu-list-bg</entry>
+ <entry>rich-menu-list-bg</entry>
- <entry>Defines the class for a general background list</entry>
+ <entry>Defines styles for a general background list</entry>
</row>
</tbody>
</tgroup>
Modified: trunk/docs/userguide/en/src/main/docbook/included/menuGroup.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/menuGroup.xml 2007-09-18 15:08:21 UTC (rev 2983)
+++ trunk/docs/userguide/en/src/main/docbook/included/menuGroup.xml 2007-09-18 17:31:32 UTC (rev 2984)
@@ -175,11 +175,11 @@
<section>
<title>Skin parameters redefinition</title>
<table>
- <title>Label Skin parameters redefinition</title>
+ <title>Skin parameters redefinition for a group</title>
<tgroup cols="2">
<thead>
<row>
- <entry>Skin parameters for group</entry>
+ <entry>Skin parameters</entry>
<entry>CSS properties</entry>
</row>
</thead>
@@ -196,11 +196,11 @@
</tgroup>
</table>
<table>
- <title>Label Skin parameters redefinition</title>
+ <title>Skin parameters redefinition for a disabled group</title>
<tgroup cols="2">
<thead>
<row>
- <entry>Skin parameters for disabled group</entry>
+ <entry>Skin parameters</entry>
<entry>CSS properties</entry>
</row>
</thead>
@@ -214,11 +214,11 @@
</table>
<table>
- <title>Label Skin parameters redefinition</title>
+ <title>Skin parameters redefinition for a label</title>
<tgroup cols="2">
<thead>
<row>
- <entry>Skin parameters for text label</entry>
+ <entry>Skin parameters</entry>
<entry>CSS properties</entry>
</row>
</thead>
@@ -233,8 +233,8 @@
</section>
<section>
- <title> Definition custom style classes </title>
- <para> The classes names that define group element appearance are in the screenshot. </para>
+ <title>Definition of Custom Style Classes</title>
+ <para>On the screenshot there are classes names that define styles for component elements.</para>
<figure>
<title>Classes names</title>
<mediaobject>
@@ -244,7 +244,7 @@
</mediaobject>
</figure>
<table>
- <title>Classes names that define group element appearance.</title>
+ <title>Classes names that define an appearance of group elements</title>
<tgroup cols="2">
<thead>
<row>
@@ -254,28 +254,27 @@
</thead>
<tbody>
<row>
- <entry>Rich-menu-group</entry>
- <entry>Defines the class for wrapping div element for the whole
- group</entry>
+ <entry>rich-menu-group</entry>
+ <entry>Defines styles for a wrapper <div> element for a group</entry>
</row>
<row>
- <entry>Rich-menu-item-label</entry>
- <entry>Defines properties for the text</entry>
+ <entry>rich-menu-item-label</entry>
+ <entry>Defines styles for a label of an item</entry>
</row>
<row>
- <entry>Rich-menu-item-icon</entry>
- <entry>Defines properties for the left icon element</entry>
+ <entry>rich-menu-item-icon</entry>
+ <entry>Defines styles for a left icon of an item</entry>
</row>
<row>
- <entry>Rich-menu-item-folder</entry>
- <entry>Defines properties for the right icon element</entry>
+ <entry>rich-menu-item-folder</entry>
+ <entry>Defines styles for a right icon of an item</entry>
</row>
</tbody>
</tgroup>
</table>
- <para> All listed elements except for the general one are defined for disabled mode. </para>
+
<table>
- <title>Classes names for disabled mode</title>
+ <title>Classes names that define different states</title>
<tgroup cols="2">
<thead>
<row>
@@ -285,17 +284,29 @@
</thead>
<tbody>
<row>
- <entry>Rich-menu-item-label-disabled</entry>
- <entry>Defines properties for the text</entry>
+ <entry>rich-menu-item-label-disabled</entry>
+ <entry>Defines styles for a label of a disabled item</entry>
</row>
<row>
- <entry>Rich-menu-item-icon-disabled</entry>
- <entry>Defines properties for the left icon element</entry>
+ <entry>rich-menu-item-icon-disabled</entry>
+ <entry>Defines styles for a left icon of a disabled item</entry>
</row>
<row>
- <entry>Rich-menu-item-folder-disabled</entry>
- <entry>Defines properties for the right icon element</entry>
+ <entry>rich-menu-item-folder-disabled</entry>
+ <entry>Defines styles for a right icon of a disabled item</entry>
</row>
+ <row>
+ <entry>rich-menu-group-hover</entry>
+ <entry>Defines styles for a wrapper <div> element of a hover group</entry>
+ </row>
+ <row>
+ <entry>rich-menu-item-icon-enabled</entry>
+ <entry>Defines styles for a left icon of an enabled item</entry>
+ </row>
+ <row>
+ <entry>rich-menu-item-icon-selected</entry>
+ <entry>Defines styles for a left icon of a selected item</entry>
+ </row>
</tbody>
</tgroup>
</table>
Modified: trunk/docs/userguide/en/src/main/docbook/included/menuItem.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/menuItem.xml 2007-09-18 15:08:21 UTC (rev 2983)
+++ trunk/docs/userguide/en/src/main/docbook/included/menuItem.xml 2007-09-18 17:31:32 UTC (rev 2984)
@@ -180,11 +180,11 @@
<section>
<title>Skin parameters redefinition</title>
<table>
- <title>Label skin parameters redefinition</title>
+ <title>Skin parameters redefinition for an item</title>
<tgroup cols="2">
<thead>
<row>
- <entry>Skin parameters for item</entry>
+ <entry>Skin parameters</entry>
<entry>CSS properties</entry>
</row>
</thead>
@@ -202,11 +202,11 @@
</table>
<table>
- <title>Label skin parameters redefinition</title>
+ <title>Skin parameters redefinition for a hovered item</title>
<tgroup cols="2">
<thead>
<row>
- <entry>Skin parameters for hovered item</entry>
+ <entry>Skin parameters</entry>
<entry>CSS properties</entry>
</row>
</thead>
@@ -224,11 +224,11 @@
</table>
<table>
- <title>Label skin parameters redefinition</title>
+ <title>Skin parameters redefinition for a disabled item</title>
<tgroup cols="2">
<thead>
<row>
- <entry>Skin parameters for disabled item</entry>
+ <entry>Skin parameters</entry>
<entry>CSS properties</entry>
</row>
</thead>
@@ -242,11 +242,11 @@
</table>
<table>
- <title>Label skin parameters redefinition</title>
+ <title>Skin parameters redefinition for a label</title>
<tgroup cols="2">
<thead>
<row>
- <entry>Skin parameters for text element label</entry>
+ <entry>Skin parameters</entry>
<entry>CSS properties</entry>
</row>
</thead>
@@ -262,7 +262,7 @@
<section>
<title> Definition of Custom Style Classes </title>
- <para> In the screenshot, the classes names that define item element appearance are shown. </para>
+ <para> On the screenshot there are classes names that define styles for component elements.</para>
<figure>
<title>Class names</title>
<mediaobject>
@@ -272,7 +272,7 @@
</mediaobject>
</figure>
<table>
- <title>Class names that define item element appearance.</title>
+ <title>Classes names that define an appearance of item elements</title>
<tgroup cols="2">
<thead>
<row>
@@ -282,24 +282,22 @@
</thead>
<tbody>
<row>
- <entry>Rich-menu-item</entry>
- <entry>Defines the class for wrapping div element for the whole item</entry>
+ <entry>rich-menu-item</entry>
+ <entry>Defines styles for a wrapper <div> element for an item</entry>
</row>
<row>
- <entry>Rich-menu-item-label</entry>
- <entry>Defines properties for the text</entry>
+ <entry>rich-menu-item-label</entry>
+ <entry>Defines styles for a label of an item</entry>
</row>
<row>
- <entry>Rich-menu-item-icon</entry>
- <entry>Defines properties for the left icon element</entry>
+ <entry>rich-menu-item-icon</entry>
+ <entry>Defines styles for a left icon of an item</entry>
</row>
</tbody>
</tgroup>
</table>
- <para> All listed elements except the general ones are defined for disabled, enabled, and
- hovered modes. </para>
- <table>
- <title>Class names for modes</title>
+ <table>
+ <title>Classes names that define different states</title>
<tgroup cols="2">
<thead>
<row>
@@ -309,41 +307,41 @@
</thead>
<tbody>
<row>
- <entry>Rich-menu-item-disabled</entry>
- <entry>Defines the class for wrapping div element for the whole item</entry>
+ <entry>rich-menu-item-disabled</entry>
+ <entry>Defines styles for a wrapper <div> element of an item</entry>
</row>
<row>
- <entry>Rich-menu-item-enabled</entry>
- <entry>Defines the class for wrapping div element for the whole item</entry>
+ <entry>rich-menu-item-enabled</entry>
+ <entry>Defines styles for a wrapper <div> element of an enabled item</entry>
</row>
<row>
- <entry>Rich-menu-item-hover</entry>
- <entry>Defines the class for wrapping div element for the whole item</entry>
+ <entry>rich-menu-item-hover</entry>
+ <entry>Defines styles for a wrapper <div> element of a hover item</entry>
</row>
<row>
- <entry>Rich-menu-item-label-disabled</entry>
- <entry>Defines properties for the text</entry>
+ <entry>rich-menu-item-label-disabled</entry>
+ <entry>Defines styles for a label of a disabled item</entry>
</row>
<row>
- <entry>Rich-menu-item-icon-disabled</entry>
- <entry>Defines properties for the left icon element</entry>
+ <entry>rich-menu-item-icon-disabled</entry>
+ <entry>Defines styles for a left icon of a disabled item</entry>
</row>
<row>
- <entry>Rich-menu-item-label-enabled</entry>
- <entry>Defines properties for the text</entry>
+ <entry>rich-menu-item-label-enabled</entry>
+ <entry>Defines styles for a label of an enabled item</entry>
</row>
<row>
- <entry>Rich-menu-item-icon-enabled</entry>
- <entry>Defines properties for the left icon element</entry>
+ <entry>rich-menu-item-icon-enabled</entry>
+ <entry>Defines styles for a left icon of an enabled item</entry>
</row>
<row>
- <entry>Rich-menu-item-label-selected</entry>
- <entry>Defines properties for the text</entry>
+ <entry>rich-menu-item-label-selected</entry>
+ <entry>Defines styles for a label of a selected item</entry>
</row>
<row>
- <entry>Rich-menu-item-icon-selected</entry>
- <entry>Defines properties for the left icon element</entry>
+ <entry>rich-menu-item-icon-selected</entry>
+ <entry>Defines styles for a left icon of a selected item</entry>
</row>
</tbody>
</tgroup>
18 years, 7 months
JBoss Rich Faces SVN: r2983 - in trunk/test-applications/jsp/src/main: webapp/WEB-INF and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2007-09-18 11:08:21 -0400 (Tue, 18 Sep 2007)
New Revision: 2983
Added:
trunk/test-applications/jsp/src/main/webapp/pages/Map.jsp
Modified:
trunk/test-applications/jsp/src/main/java/panelMenu/PanelMenu.java
trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config.xml
trunk/test-applications/jsp/src/main/webapp/pages/Div.jsp
trunk/test-applications/jsp/src/main/webapp/pages/RichTest.jsp
trunk/test-applications/jsp/src/main/webapp/pages/SelectOneMenuPage.jsp
trunk/test-applications/jsp/src/main/webapp/pages/main.jsp
Log:
update
Modified: trunk/test-applications/jsp/src/main/java/panelMenu/PanelMenu.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/panelMenu/PanelMenu.java 2007-09-18 15:08:07 UTC (rev 2982)
+++ trunk/test-applications/jsp/src/main/java/panelMenu/PanelMenu.java 2007-09-18 15:08:21 UTC (rev 2983)
@@ -63,6 +63,7 @@
return rendered;
}
public void setRendered(String rendered) {
+ System.out.println(rendered);
this.rendered = rendered;
}
public Icon getIcon() {
Modified: trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config.xml 2007-09-18 15:08:07 UTC (rev 2982)
+++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config.xml 2007-09-18 15:08:21 UTC (rev 2983)
@@ -120,6 +120,10 @@
<from-outcome>RichTest</from-outcome>
<to-view-id>/pages/RichTest.jsp</to-view-id>
</navigation-case>
+ <navigation-case>
+ <from-outcome>Map</from-outcome>
+ <to-view-id>/pages/Map.jsp</to-view-id>
+ </navigation-case>
</navigation-rule>
<navigation-rule>
<from-view-id>*</from-view-id>
Modified: trunk/test-applications/jsp/src/main/webapp/pages/Div.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/pages/Div.jsp 2007-09-18 15:08:07 UTC (rev 2982)
+++ trunk/test-applications/jsp/src/main/webapp/pages/Div.jsp 2007-09-18 15:08:21 UTC (rev 2983)
@@ -11,7 +11,9 @@
<body>
<h:form>
<h:panelGrid columns="2">
- <h:panelGroup>
+ <h:selectOneMenu binding="#{skinBean.component}"></h:selectOneMenu>
+ <h:commandLink action="#{skinBean.change}" value="set skin" />
+
<h:outputText value="Select component:" />
<h:selectOneMenu value="#{divBean.src}" onchange="submit();">
<f:selectItem itemValue="/Calendar/Calendar.jsp" itemLabel="Calendar" />
@@ -43,7 +45,6 @@
<f:selectItem itemValue="/Tree/Tree.jsp" itemLabel="Tree" />
<f:selectItem itemValue="/VirtualEarth/VirtualEarth.jsp" itemLabel="Virtual Earth" />
</h:selectOneMenu>
- </h:panelGroup>
</h:panelGrid>
</h:form>
<div id="div_1_ID" style="position: relative; left:400px; top:400px; border-color: red, 2px;">
Added: trunk/test-applications/jsp/src/main/webapp/pages/Map.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/pages/Map.jsp (rev 0)
+++ trunk/test-applications/jsp/src/main/webapp/pages/Map.jsp 2007-09-18 15:08:21 UTC (rev 2983)
@@ -0,0 +1,55 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
+<f:view>
+<html>
+<head>
+<title></title>
+<link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" />
+</head>
+<body>
+ <h:form>
+ <h:panelGrid columns="2">
+ <h:selectOneMenu binding="#{skinBean.component}"></h:selectOneMenu>
+ <h:commandLink action="#{skinBean.change}" value="set skin" />
+ <h:outputText value="Select component:" />
+ <h:selectOneMenu value="#{divBean.src}" onchange="submit();">
+ <f:selectItem itemValue="/Calendar/Calendar.jsp" itemLabel="Calendar" />
+ <f:selectItem itemValue="/DataFilterSlider/DataFilterSlider.jsp" itemLabel="Data Filter Slider" />
+ <f:selectItem itemValue="/DataScroller/DS.jsp" itemLabel="Date Scroller" />
+ <f:selectItem itemValue="/DataTable/DT.jsp" itemLabel="Date Table" />
+ <f:selectItem itemValue="/DradAndDrop/DragAndDrop.jsp" itemLabel="Drag And Drop" />
+ <f:selectItem itemValue="/DropDownMenu/DDMenu.jsp" itemLabel="Drop Down Menu" />
+ <f:selectItem itemValue="/Effect/Effect.jsp" itemLabel="Effect" />
+ <f:selectItem itemValue="/Gmap/Gmap.jsp" itemLabel="Gmap" />
+ <f:selectItem itemValue="/inputNumberSlider/inputNumberSlider.jsp" itemLabel="Input Number Slider" />
+ <f:selectItem itemValue="/inputNumberSpinner/inputNumberSpinner.jsp" itemLabel="Input Number Spinner" />
+ <f:selectItem itemValue="/Insert/Insert.jsp" itemLabel="Insert" />
+ <f:selectItem itemValue="/Message/Message.jsp" itemLabel="Message" />
+ <f:selectItem itemValue="/ModalPanel/ModalPanel.jsp" itemLabel="Modal Panel" />
+ <f:selectItem itemValue="/Paint2D/Paint2D.jsp" itemLabel="Paint2D" />
+ <f:selectItem itemValue="/Panel/Panel.jsp" itemLabel="Panel" />
+ <f:selectItem itemValue="/Panel/panel2.jsp" itemLabel="Panel2" />
+ <f:selectItem itemValue="/PanelBar/PanelBar.jsp" itemLabel="Panel Bar" />
+ <f:selectItem itemValue="/PanelMenu/PanelMenu.jsp" itemLabel="Panel Menu" />
+ <f:selectItem itemValue="/Separator/Separator.jsp" itemLabel="Separator" />
+ <f:selectItem itemValue="/SimpleTogglePanel/SimpleTogglePanel.jsp" itemLabel="Simple Toggle Panel" />
+ <f:selectItem itemValue="/Spacer/Spacer.jsp" itemLabel="Spacer" />
+ <f:selectItem itemValue="/SuggestionBox/SuggestionBox.jsp" itemLabel="Suggestion Box" />
+ <f:selectItem itemValue="/TabPanel/TabPanel.jsp" itemLabel="Tab Panel" />
+ <f:selectItem itemValue="/TogglePanel/TogglePanel.jsp" itemLabel="Toggle Panel" />
+ <f:selectItem itemValue="/ToolBar/ToolBar.jsp" itemLabel="Tool Bar" />
+ <f:selectItem itemValue="/Tooltip/Tooltip.jsp" itemLabel="Tooltip" />
+ <f:selectItem itemValue="/Tree/Tree.jsp" itemLabel="Tree" />
+ <f:selectItem itemValue="/VirtualEarth/VirtualEarth.jsp" itemLabel="Virtual Earth" />
+ </h:selectOneMenu>
+ </h:panelGrid>
+ </h:form>
+ <div id="divID" style="position: absolute; top:15px; left: 10px; z-index: 1">
+ <jsp:include page="SelectOneMenuPage.jsp" />
+ </div>
+ <jsp:include page="${divBean.src}" />
+</body>
+</html>
+</f:view>
\ No newline at end of file
Modified: trunk/test-applications/jsp/src/main/webapp/pages/RichTest.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/pages/RichTest.jsp 2007-09-18 15:08:07 UTC (rev 2982)
+++ trunk/test-applications/jsp/src/main/webapp/pages/RichTest.jsp 2007-09-18 15:08:21 UTC (rev 2983)
@@ -11,7 +11,9 @@
<body>
<h:form>
<h:panelGrid columns="2">
- <h:panelGroup>
+ <h:selectOneMenu binding="#{skinBean.component}"></h:selectOneMenu>
+ <h:commandLink action="#{skinBean.change}" value="set skin" />
+
<h:outputText value="Select component:" />
<h:selectOneMenu value="#{divBean.src}" onchange="submit();">
<f:selectItem itemValue="/Calendar/Calendar.jsp" itemLabel="Calendar" />
@@ -43,7 +45,6 @@
<f:selectItem itemValue="/Tree/Tree.jsp" itemLabel="Tree" />
<f:selectItem itemValue="/VirtualEarth/VirtualEarth.jsp" itemLabel="Virtual Earth" />
</h:selectOneMenu>
- </h:panelGroup>
</h:panelGrid>
</h:form>
<jsp:include page="${divBean.src}" />
Modified: trunk/test-applications/jsp/src/main/webapp/pages/SelectOneMenuPage.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/pages/SelectOneMenuPage.jsp 2007-09-18 15:08:07 UTC (rev 2982)
+++ trunk/test-applications/jsp/src/main/webapp/pages/SelectOneMenuPage.jsp 2007-09-18 15:08:21 UTC (rev 2983)
@@ -2,8 +2,8 @@
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+
<f:subview id="selectOneMenuPage">
- <div id="divID" style="position: absolute; top:15px; left: 10px; z-index: 1">
<h:panelGrid columns="7" cellpadding="20px" cellspacing="30px">
<h:selectOneMenu value="selectItem" >
<f:selectItem itemLabel="selectItem" itemValue="test" />
@@ -173,5 +173,4 @@
<f:selectItem itemLabel="selectItem" itemValue="test" />
</h:selectOneMenu>
</h:panelGrid>
- </div>
</f:subview>
\ No newline at end of file
Modified: trunk/test-applications/jsp/src/main/webapp/pages/main.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/pages/main.jsp 2007-09-18 15:08:07 UTC (rev 2982)
+++ trunk/test-applications/jsp/src/main/webapp/pages/main.jsp 2007-09-18 15:08:21 UTC (rev 2983)
@@ -10,17 +10,13 @@
<body>
<f:view>
<h:form>
- <rich:panel>
- <h:selectOneRadio binding="#{skinBean.component}" />
- <h:commandLink action="#{skinBean.change}" value="set skin" />
- </rich:panel>
-
<div align="center"><h:outputText
- value="VCP 3.1.0 Test Application (JSF 1.1 RI)" styleClass="maintext"></h:outputText></div>
+ value="VCP 3.2.0 Test Application (JSF 1.1RI(1.2RI))" styleClass="maintext"></h:outputText></div>
<rich:panel>
<h:panelGrid columns="2" cellpadding="5px">
- <h:commandLink value="Test Div" action="TestDiv"></h:commandLink>
- <h:commandLink value="Rich Test" action="RichTest"></h:commandLink>
+ <h:commandLink value="RichFaces" action="RichTest"></h:commandLink>
+ <h:commandLink value="Div" action="TestDiv"></h:commandLink>
+ <h:commandLink value="Select" action="Map"></h:commandLink>
</h:panelGrid>
</rich:panel>
</h:form>
18 years, 7 months
JBoss Rich Faces SVN: r2982 - in trunk/test-applications/facelets/src/main: java/demo and 5 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2007-09-18 11:08:07 -0400 (Tue, 18 Sep 2007)
New Revision: 2982
Added:
trunk/test-applications/facelets/src/main/java/demo/
trunk/test-applications/facelets/src/main/java/demo/PhaseTracker.java
trunk/test-applications/facelets/src/main/java/richTest/
trunk/test-applications/facelets/src/main/java/richTest/RichTest.java
trunk/test-applications/facelets/src/main/webapp/Rich/
trunk/test-applications/facelets/src/main/webapp/Rich/RichTest.xhtml
trunk/test-applications/facelets/src/main/webapp/Rich/menu.xhtml
trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-RichTest.xml
Modified:
trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config.xml
trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml
trunk/test-applications/facelets/src/main/webapp/index.jsp
trunk/test-applications/facelets/src/main/webapp/pages/Div.xhtml
trunk/test-applications/facelets/src/main/webapp/pages/Map.xhtml
trunk/test-applications/facelets/src/main/webapp/pages/SelectOneMenuPage.xhtml
trunk/test-applications/facelets/src/main/webapp/pages/Test.xhtml
trunk/test-applications/facelets/src/main/webapp/pages/main.xhtml
Log:
update
Added: trunk/test-applications/facelets/src/main/java/demo/PhaseTracker.java
===================================================================
--- trunk/test-applications/facelets/src/main/java/demo/PhaseTracker.java (rev 0)
+++ trunk/test-applications/facelets/src/main/java/demo/PhaseTracker.java 2007-09-18 15:08:07 UTC (rev 2982)
@@ -0,0 +1,38 @@
+/**
+ *
+ */
+package demo;
+
+import javax.faces.event.PhaseEvent;
+import javax.faces.event.PhaseId;
+import javax.faces.event.PhaseListener;
+
+/**
+ * @author AYanul
+ *
+ */
+public class PhaseTracker implements PhaseListener {
+
+ /* (non-Javadoc)
+ * @see javax.faces.event.PhaseListener#afterPhase(javax.faces.event.PhaseEvent)
+ */
+ public void afterPhase(PhaseEvent arg0) {
+ System.out.println("PhaseTracker.afterPhase()" + arg0.getPhaseId());
+ }
+
+ /* (non-Javadoc)
+ * @see javax.faces.event.PhaseListener#beforePhase(javax.faces.event.PhaseEvent)
+ */
+ public void beforePhase(PhaseEvent arg0) {
+ System.out.println("PhaseTracker.beforePhase()" + arg0.getPhaseId());
+ }
+
+ /* (non-Javadoc)
+ * @see javax.faces.event.PhaseListener#getPhaseId()
+ */
+ public PhaseId getPhaseId() {
+ // TODO Auto-generated method stub
+ return PhaseId.ANY_PHASE;
+ }
+
+}
Added: trunk/test-applications/facelets/src/main/java/richTest/RichTest.java
===================================================================
--- trunk/test-applications/facelets/src/main/java/richTest/RichTest.java (rev 0)
+++ trunk/test-applications/facelets/src/main/java/richTest/RichTest.java 2007-09-18 15:08:07 UTC (rev 2982)
@@ -0,0 +1,23 @@
+package richTest;
+
+import java.util.ArrayList;
+
+import org.richfaces.component.Dropzone;
+import org.richfaces.event.DropEvent;
+import org.richfaces.event.DropListener;
+
+
+public class RichTest {
+ private String [] items = new String [] {"item 1", "item 2", "item 3", "item 4", "item 5", "item 6", "item 7", "item 8", "item 9", "item 10", "item 11", "item 12", "item 13", "item 14", "item 15"};
+
+ public RichTest() {
+ }
+
+ public String[] getItems() {
+ return items;
+ }
+
+ public void setItems(String[] items) {
+ this.items = items;
+ }
+}
Added: trunk/test-applications/facelets/src/main/webapp/Rich/RichTest.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/Rich/RichTest.xhtml (rev 0)
+++ trunk/test-applications/facelets/src/main/webapp/Rich/RichTest.xhtml 2007-09-18 15:08:07 UTC (rev 2982)
@@ -0,0 +1,32 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:rich="http://richfaces.org/rich"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+<f:view>
+ <head>
+ <title></title>
+ </head>
+ <body>
+ <h:form id="richTestID">
+ <ui:include src="/Rich/menu.xhtml" />
+ <h:panelGrid columns="2">
+ <rich:panel>
+ <f:facet name="header">
+ <h:outputText value="panel" />
+ </f:facet>
+ <rich:tabPanel switchType="ajax">
+ <rich:tab>
+ <h:outputText value="Text" />
+ </rich:tab>
+ </rich:tabPanel>
+ </rich:panel>
+ </h:panelGrid>
+ <rich:separator></rich:separator>
+
+ </h:form>
+ </body>
+</f:view>
+</html>
Added: trunk/test-applications/facelets/src/main/webapp/Rich/menu.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/Rich/menu.xhtml (rev 0)
+++ trunk/test-applications/facelets/src/main/webapp/Rich/menu.xhtml 2007-09-18 15:08:07 UTC (rev 2982)
@@ -0,0 +1,150 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:rich="http://richfaces.org/rich">
+
+ <f:subview id="menuTestID">
+ <rich:toolBar itemSeparator="disc">
+ <rich:dropDownMenu value="File" event="onmouseover" submitMode="ajax">
+ <rich:menuItem value="Item 1" ></rich:menuItem>
+ <rich:menuSeparator />
+ <rich:menuItem value="Item 2"></rich:menuItem>
+ <rich:menuSeparator />
+ <rich:menuItem value="Item 3"></rich:menuItem>
+ <rich:menuSeparator />
+ <rich:menuItem value="Item 4"></rich:menuItem>
+ <rich:menuSeparator />
+ <rich:menuItem value="Item 5"></rich:menuItem>
+ <rich:menuSeparator />
+ <rich:menuItem value="Item 6"></rich:menuItem>
+ <rich:menuSeparator />
+ <rich:menuItem value="Item 7"></rich:menuItem>
+ <rich:menuSeparator />
+ <rich:menuGroup value="menu 1">
+ <rich:menuItem value="Item 1" ></rich:menuItem>
+ <rich:menuSeparator />
+ <rich:menuItem value="Item 2"></rich:menuItem>
+ <rich:menuSeparator />
+ <rich:menuItem value="Item 3"></rich:menuItem>
+ <rich:menuSeparator />
+ <rich:menuItem value="Item 4"></rich:menuItem>
+ <rich:menuGroup value="menu 1_1">
+ <rich:menuItem value="Item 1" ></rich:menuItem>
+ <rich:menuSeparator />
+ <rich:menuItem value="Item 2"></rich:menuItem>
+ <rich:menuSeparator />
+ <rich:menuItem value="Item 3"></rich:menuItem>
+ <rich:menuSeparator />
+ <rich:menuItem value="Item 4"></rich:menuItem>
+ </rich:menuGroup>
+ </rich:menuGroup>
+ <rich:menuGroup value="menu 2">
+ <rich:menuItem value="Item 1" ></rich:menuItem>
+ <rich:menuSeparator />
+ <rich:menuItem value="Item 2"></rich:menuItem>
+ <rich:menuSeparator />
+ <rich:menuItem value="Item 3"></rich:menuItem>
+ <rich:menuSeparator />
+ <rich:menuItem value="Item 4"></rich:menuItem>
+ </rich:menuGroup>
+ </rich:dropDownMenu>
+
+ <rich:dropDownMenu value="Edit" event="onmouseover">
+ <rich:menuItem value="Item 1" ></rich:menuItem>
+ <rich:menuSeparator />
+ <rich:menuItem value="Item 2"></rich:menuItem>
+ <rich:menuSeparator />
+ <rich:menuItem value="Item 3"></rich:menuItem>
+ <rich:menuSeparator />
+ <rich:menuItem value="Item 4"></rich:menuItem>
+ <rich:menuSeparator />
+ <rich:menuItem value="Item 5"></rich:menuItem>
+ <rich:menuSeparator />
+ <rich:menuSeparator />
+ <rich:menuItem value="Item 6"></rich:menuItem>
+ <rich:menuSeparator />
+ <rich:menuItem value="Item 7"></rich:menuItem>
+ <rich:menuSeparator />
+ <rich:menuItem value="Item 8"></rich:menuItem>
+ <rich:menuSeparator />
+ <rich:menuItem value="Item 9"></rich:menuItem>
+ <rich:menuSeparator />
+ <rich:menuItem value="Item 10"></rich:menuItem>
+ <rich:menuSeparator />
+ <rich:menuItem value="Item 11"></rich:menuItem>
+ <rich:menuSeparator />
+ <rich:menuItem value="Item 12"></rich:menuItem>
+ <rich:menuSeparator />
+ <rich:menuItem value="Item 13"></rich:menuItem>
+ <rich:menuSeparator />
+ <rich:menuItem value="Item 14"></rich:menuItem>
+ <rich:menuSeparator />
+ <rich:menuItem value="Item 15"></rich:menuItem>
+ <rich:menuSeparator />
+ <rich:menuGroup value="menu 1">
+ <rich:menuItem value="Item 1" ></rich:menuItem>
+ <rich:menuSeparator />
+ <rich:menuItem value="Item 2"></rich:menuItem>
+ <rich:menuSeparator />
+ <rich:menuItem value="Item 3"></rich:menuItem>
+ <rich:menuSeparator />
+ <rich:menuItem value="Item 4"></rich:menuItem>
+ <rich:menuSeparator />
+ <rich:menuGroup value="menu 1_1">
+ <rich:menuItem value="Item 1" ></rich:menuItem>
+ <rich:menuSeparator />
+ <rich:menuItem value="Item 2"></rich:menuItem>
+ <rich:menuSeparator />
+ <rich:menuItem value="Item 3"></rich:menuItem>
+ <rich:menuSeparator />
+ <rich:menuItem value="Item 4"></rich:menuItem>
+ </rich:menuGroup>
+ </rich:menuGroup>
+ <rich:menuGroup value="menu 2">
+ <rich:menuItem value="Item 1" ></rich:menuItem>
+ <rich:menuSeparator />
+ <rich:menuItem value="Item 2"></rich:menuItem>
+ <rich:menuSeparator />
+ <rich:menuItem value="Item 3"></rich:menuItem>
+ <rich:menuSeparator />
+ <rich:menuItem value="Item 4"></rich:menuItem>
+ </rich:menuGroup>
+ </rich:dropDownMenu>
+
+ <rich:toolBarGroup>
+ <rich:dropDownMenu value="Navigate" event="onmouseover">
+ <rich:menuGroup value="menu 1">
+ <rich:menuItem value="Item 1" ></rich:menuItem>
+ <rich:menuItem value="Item 2"></rich:menuItem>
+ <rich:menuItem value="Item 3"></rich:menuItem>
+ <rich:menuItem value="Item 4"></rich:menuItem>
+ <rich:menuGroup value="menu 1_1">
+ <rich:menuItem value="Item 1" ></rich:menuItem>
+ <rich:menuItem value="Item 2"></rich:menuItem>
+ <rich:menuItem value="Item 3"></rich:menuItem>
+ <rich:menuItem value="Item 4"></rich:menuItem>
+ </rich:menuGroup>
+ </rich:menuGroup>
+ <rich:menuGroup value="menu 2">
+ <rich:menuItem value="Item 1" ></rich:menuItem>
+ <rich:menuItem value="Item 2"></rich:menuItem>
+ <rich:menuItem value="Item 3"></rich:menuItem>
+ <rich:menuItem value="Item 4"></rich:menuItem>
+ </rich:menuGroup>
+ <rich:menuItem value="Item 1" ></rich:menuItem>
+ <rich:menuItem value="Item 2"></rich:menuItem>
+ <rich:menuItem value="Item 3"></rich:menuItem>
+ <rich:menuItem value="Item 4"></rich:menuItem>
+ <rich:menuItem value="Item 5"></rich:menuItem>
+ <rich:menuItem value="Item 6"></rich:menuItem>
+ <rich:menuItem value="Item 7"></rich:menuItem>
+ <rich:menuItem value="Item 8"></rich:menuItem>
+ <rich:menuItem value="Item 9"></rich:menuItem>
+ <rich:menuItem value="Item 10"></rich:menuItem>
+ </rich:dropDownMenu>
+ <h:graphicImage value="/pics/ajax_process.gif"></h:graphicImage>
+ </rich:toolBarGroup>
+ </rich:toolBar>
+ </f:subview>
+</html>
\ No newline at end of file
Added: trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-RichTest.xml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-RichTest.xml (rev 0)
+++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-RichTest.xml 2007-09-18 15:08:07 UTC (rev 2982)
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
+ "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
+<faces-config>
+ <managed-bean>
+ <managed-bean-name>richTest</managed-bean-name>
+ <managed-bean-class>richTest.RichTest</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ </managed-bean>
+</faces-config>
Modified: trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config.xml 2007-09-18 15:00:10 UTC (rev 2981)
+++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config.xml 2007-09-18 15:08:07 UTC (rev 2982)
@@ -124,6 +124,10 @@
<from-outcome>Map</from-outcome>
<to-view-id>/pages/Map.xhtml</to-view-id>
</navigation-case>
+ <navigation-case>
+ <from-outcome>RichTest</from-outcome>
+ <to-view-id>/Rich/RichTest.xhtml</to-view-id>
+ </navigation-case>
</navigation-rule>
<navigation-rule>
<from-view-id>/Panel/Panel.xhtml</from-view-id>
@@ -149,4 +153,7 @@
<application>
<view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
</application>
+ <lifecycle>
+ <phase-listener id="phaseTracker">demo.PhaseTracker</phase-listener>
+ </lifecycle>
</faces-config>
Modified: trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml 2007-09-18 15:00:10 UTC (rev 2981)
+++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml 2007-09-18 15:08:07 UTC (rev 2982)
@@ -33,7 +33,7 @@
</context-param>
<context-param>
<param-name>javax.faces.CONFIG_FILES</param-name>
- <param-value>/WEB-INF/faces-config-DataTable.xml,/WEB-INF/faces-config-SimpleTogglePanel.xml,/WEB-INF/faces-config-Panel.xml,/WEB-INF/faces-config-PanelBar.xml,/WEB-INF/faces-config-TabPanel.xml,/WEB-INF/faces-config-TogglePanel.xml,/WEB-INF/faces-config-Paint2D.xml,/WEB-INF/faces-config-InputNumberSlider.xml,/WEB-INF/faces-config-InputNumberSpinner.xml,/WEB-INF/faces-config-DDMenu.xml,/WEB-INF/faces-config-Tree.xml,/WEB-INF/faces-config-PanelMenu.xml,/WEB-INF/faces-config-Icon.xml,/WEB-INF/faces-config-ModalPanel.xml,/WEB-INF/faces-config-tooltip.xml,/WEB-INF/faces-config-Skin.xml,/WEB-INF/faces-config-Calendar.xml,/WEB-INF/faces-config-Gmap.xml,/WEB-INF/faces-config-DataFilterSlider.xml,/WEB-INF/faces-config-Separator.xml,/WEB-INF/faces-config-Spacer.xml,/WEB-INF/faces-config-ToolBar.xml,/WEB-INF/faces-config-DataScroller.xml,/WEB-INF/faces-config-DradAbdDrop.xml,/WEB-INF/faces-config-SuggestionBox.xml,/WEB-INF/faces-config-Message.xml,/WEB-INF/faces-config-VirtualEarth!
.xml,/WEB-INF/faces-config-Effect.xml,/WEB-INF/faces-config-Insert.xml,/WEB-INF/faces-config-Div.xml,/WEB-INF/faces-config-ScrollableDataTable.xml,/WEB-INF/faces-config-SelectOneMenuPage.xml</param-value>
+ <param-value>/WEB-INF/faces-config-DataTable.xml,/WEB-INF/faces-config-SimpleTogglePanel.xml,/WEB-INF/faces-config-Panel.xml,/WEB-INF/faces-config-PanelBar.xml,/WEB-INF/faces-config-TabPanel.xml,/WEB-INF/faces-config-TogglePanel.xml,/WEB-INF/faces-config-Paint2D.xml,/WEB-INF/faces-config-InputNumberSlider.xml,/WEB-INF/faces-config-InputNumberSpinner.xml,/WEB-INF/faces-config-DDMenu.xml,/WEB-INF/faces-config-Tree.xml,/WEB-INF/faces-config-PanelMenu.xml,/WEB-INF/faces-config-Icon.xml,/WEB-INF/faces-config-ModalPanel.xml,/WEB-INF/faces-config-tooltip.xml,/WEB-INF/faces-config-Skin.xml,/WEB-INF/faces-config-Calendar.xml,/WEB-INF/faces-config-Gmap.xml,/WEB-INF/faces-config-DataFilterSlider.xml,/WEB-INF/faces-config-Separator.xml,/WEB-INF/faces-config-Spacer.xml,/WEB-INF/faces-config-ToolBar.xml,/WEB-INF/faces-config-DataScroller.xml,/WEB-INF/faces-config-DradAbdDrop.xml,/WEB-INF/faces-config-SuggestionBox.xml,/WEB-INF/faces-config-Message.xml,/WEB-INF/faces-config-VirtualEarth!
.xml,/WEB-INF/faces-config-Effect.xml,/WEB-INF/faces-config-Insert.xml,/WEB-INF/faces-config-Div.xml,/WEB-INF/faces-config-ScrollableDataTable.xml,/WEB-INF/faces-config-SelectOneMenuPage.xml,/WEB-INF/faces-config-RichTest.xml</param-value>
</context-param>
<filter>
<display-name>Ajax4jsf Filter</display-name>
Modified: trunk/test-applications/facelets/src/main/webapp/index.jsp
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/index.jsp 2007-09-18 15:00:10 UTC (rev 2981)
+++ trunk/test-applications/facelets/src/main/webapp/index.jsp 2007-09-18 15:08:07 UTC (rev 2982)
@@ -2,6 +2,7 @@
<html>
<head></head>
<body>
- <jsp:forward page="pages/main.jsf" />
+ <jsp:forward page="/pages/main.jsf" />
+ <!-- /Rich/RichTest.jsf -->
</body>
</html>
\ No newline at end of file
Modified: trunk/test-applications/facelets/src/main/webapp/pages/Div.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/pages/Div.xhtml 2007-09-18 15:00:10 UTC (rev 2981)
+++ trunk/test-applications/facelets/src/main/webapp/pages/Div.xhtml 2007-09-18 15:08:07 UTC (rev 2982)
@@ -22,6 +22,9 @@
<div id="divOpthID" align="right">
<h:form id="forvDivOpthID">
<h:panelGrid columns="2">
+ <h:selectOneMenu binding="#{skinBean.component}"></h:selectOneMenu>
+ <h:commandLink action="#{skinBean.change}" value="set skin" />
+
<h:outputText value="Select component:" />
<h:selectOneMenu value="#{divBean.src}" onchange="submit();">
<f:selectItem itemValue="/Calendar/Calendar.xhtml" itemLabel="Calendar" />
Modified: trunk/test-applications/facelets/src/main/webapp/pages/Map.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/pages/Map.xhtml 2007-09-18 15:00:10 UTC (rev 2981)
+++ trunk/test-applications/facelets/src/main/webapp/pages/Map.xhtml 2007-09-18 15:08:07 UTC (rev 2982)
@@ -13,10 +13,12 @@
type="text/css" />
</head>
<body>
- <ui:include src="/pages/SelectOneMenuPage.xhtml" />
<div id="divOpthID" align="right" style="z-index: 2">
<h:form id="forvDivOpthID">
<h:panelGrid columns="2">
+ <h:selectOneMenu binding="#{skinBean.component}"></h:selectOneMenu>
+ <h:commandLink action="#{skinBean.change}" value="set skin" />
+
<h:outputText value="Select component:" />
<h:selectOneMenu value="#{divBean.src}" onchange="submit();">
<f:selectItem itemValue="/Calendar/Calendar.xhtml" itemLabel="Calendar" />
@@ -51,7 +53,9 @@
</h:panelGrid>
</h:form>
</div>
-
+ <div id="divID" style="position: absolute; top:15px; left: 10px; z-index: 1">
+ <ui:include src="/pages/SelectOneMenuPage.xhtml" />
+ </div>
<ui:include src="${divBean.src}" />
</body>
Modified: trunk/test-applications/facelets/src/main/webapp/pages/SelectOneMenuPage.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/pages/SelectOneMenuPage.xhtml 2007-09-18 15:00:10 UTC (rev 2981)
+++ trunk/test-applications/facelets/src/main/webapp/pages/SelectOneMenuPage.xhtml 2007-09-18 15:08:07 UTC (rev 2982)
@@ -3,7 +3,6 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:rich="http://richfaces.org/rich">
- <div id="divID" style="position: absolute; top:15px; left: 10px; z-index: 1">
<h:panelGrid columns="7" cellpadding="20px" cellspacing="30px">
<h:selectOneMenu value="selectItem" >
<f:selectItem itemLabel="selectItem" itemValue="test" />
@@ -173,6 +172,4 @@
<f:selectItem itemLabel="selectItem" itemValue="test" />
</h:selectOneMenu>
</h:panelGrid>
- </div>
-
</h:form>
Modified: trunk/test-applications/facelets/src/main/webapp/pages/Test.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/pages/Test.xhtml 2007-09-18 15:00:10 UTC (rev 2981)
+++ trunk/test-applications/facelets/src/main/webapp/pages/Test.xhtml 2007-09-18 15:08:07 UTC (rev 2982)
@@ -16,6 +16,9 @@
<div id="divOpthID" align="right">
<h:form id="forvDivOpthID">
<h:panelGrid columns="2">
+ <h:selectOneMenu binding="#{skinBean.component}"></h:selectOneMenu>
+ <h:commandLink action="#{skinBean.change}" value="set skin" />
+
<h:outputText value="Select component:" />
<h:selectOneMenu value="#{divBean.src}" onchange="submit();">
<f:selectItem itemValue="/Calendar/Calendar.xhtml" itemLabel="Calendar" />
Modified: trunk/test-applications/facelets/src/main/webapp/pages/main.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/pages/main.xhtml 2007-09-18 15:00:10 UTC (rev 2981)
+++ trunk/test-applications/facelets/src/main/webapp/pages/main.xhtml 2007-09-18 15:08:07 UTC (rev 2982)
@@ -10,19 +10,15 @@
</head>
<body>
<h:form>
- <rich:panel>
- <h:selectOneMenu binding="#{skinBean.component}"></h:selectOneMenu>
- <h:commandLink action="#{skinBean.change}" value="set skin" />
- </rich:panel>
-
<div align="center"><h:outputText
- value="VCP 3.1.0 Test Application (JSF 1.1RI with Facelets)"
+ value="VCP 3.2.0 Test Application (JSF 1.1RI(1.2RI) with Facelets)"
style="font-size: 30px"></h:outputText></div>
<rich:panel>
<h:panelGrid columns="2" cellpadding="5px" cellspacing="5px">
- <h:commandLink value="Test Div" action="TestDiv"></h:commandLink>
- <h:commandLink value="Test" action="Test"></h:commandLink>
- <h:commandLink value="Test select" action="Map"></h:commandLink>
+ <h:commandLink value="RichFaces" action="Test"></h:commandLink>
+ <h:commandLink value="Div" action="TestDiv"></h:commandLink>
+ <h:commandLink value="Select" action="Map"></h:commandLink>
+ <h:commandLink value="temp" action="RichTest"></h:commandLink>
</h:panelGrid>
</rich:panel>
</h:form>
18 years, 7 months
JBoss Rich Faces SVN: r2981 - trunk/ui/message/src/main/java/org/richfaces/renderkit/html.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-09-18 11:00:10 -0400 (Tue, 18 Sep 2007)
New Revision: 2981
Modified:
trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java
Log:
Modified: trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java
===================================================================
--- trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java 2007-09-18 14:56:27 UTC (rev 2980)
+++ trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java 2007-09-18 15:00:10 UTC (rev 2981)
@@ -105,28 +105,18 @@
if((layout != null) && (layout.equals("table"))){
writer.startElement("table", uiMessages);
-
getUtils().writeAttribute(writer,HTML.id_ATTRIBUTE ,uiMessages.getClientId(context));
-
getUtils().writeAttribute(writer, HTML.cellpadding_ATTRIBUTE, "0");
getUtils().writeAttribute(writer, HTML.cellspacing_ATTRIBUTE, "0");
-
-
-
renderComponentOuterStyles(uiMessages, context, writer, isDisplayNone);
-
writer.startElement("tbody", uiMessages);
-
isWroteTable = true;
}else if((layout != null) && (layout.equals("list"))){
isWroteTable = false;
-
writer.startElement("dl", uiMessages);
-
getUtils().writeAttribute(writer,HTML.id_ATTRIBUTE ,uiMessages.getClientId(context));
-
renderComponentOuterStyles(uiMessages, context, writer, isDisplayNone);
}
@@ -170,9 +160,7 @@
uiMessages = (UIRichMessages)component;
boolean isTooltip = getUtils().isBooleanAttribute(uiMessages, "tooltip");
-
boolean showSummary = uiMessages.isShowSummary();
-
boolean showDetail = uiMessages.isShowDetail();
if(facesMsg != null){
@@ -181,9 +169,7 @@
}
labelClass = labelClass == null ? "rich-messages-label" : "rich-messages-label " + labelClass;
-
writer.startElement(HTML.SPAN_ELEM, uiMessages);
-
getUtils().writeAttribute(writer, HTML.class_ATTRIBUTE,labelClass);
getUtils().writeAttribute(writer, HTML.style_ATTRIBUTE, labelStyle);
@@ -233,15 +219,11 @@
}
uiMessages = (UIRichMessages)component;
-
writer.startElement(HTML.SPAN_ELEM, uiMessages);
-
String classes = markerClass == null ? "rich-messages-marker" : "rich-messages-marker " + markerClass;
getUtils().writeAttribute(writer, HTML.class_ATTRIBUTE, classes);
getUtils().writeAttribute(writer, HTML.style_ATTRIBUTE, markerStyle);
-
renderChild(context, markerFacet);
-
writer.endElement(HTML.SPAN_ELEM);
}
18 years, 7 months
JBoss Rich Faces SVN: r2980 - trunk/ui/message/src/main/java/org/richfaces/renderkit/html.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-09-18 10:56:27 -0400 (Tue, 18 Sep 2007)
New Revision: 2980
Modified:
trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java
Log:
fix RF-956, render display: none style in renderOuterStyle function
Modified: trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java
===================================================================
--- trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java 2007-09-18 14:54:09 UTC (rev 2979)
+++ trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java 2007-09-18 14:56:27 UTC (rev 2980)
@@ -98,6 +98,8 @@
UIRichMessages uiMessages = (UIRichMessages)component;
+
+ boolean isDisplayNone = (!messagesIter.hasNext() && !uiMessages.isPassed()) ? true : false;
layout = (String)uiMessages.getAttributes().get("layout");
if((layout != null) && (layout.equals("table"))){
@@ -108,9 +110,11 @@
getUtils().writeAttribute(writer, HTML.cellpadding_ATTRIBUTE, "0");
getUtils().writeAttribute(writer, HTML.cellspacing_ATTRIBUTE, "0");
-
- renderComponentOuterStyles(uiMessages, context, writer);
+
+
+ renderComponentOuterStyles(uiMessages, context, writer, isDisplayNone);
+
writer.startElement("tbody", uiMessages);
isWroteTable = true;
@@ -123,14 +127,14 @@
getUtils().writeAttribute(writer,HTML.id_ATTRIBUTE ,uiMessages.getClientId(context));
- renderComponentOuterStyles(uiMessages, context, writer);
+ renderComponentOuterStyles(uiMessages, context, writer, isDisplayNone);
}
if(!messagesIter.hasNext()){
renderBody(uiMessages, context, writer, null);
}else{
-
+
while(messagesIter.hasNext()){
FacesMessage facesMsg = (FacesMessage)(messagesIter.next());
renderBody(uiMessages, context, writer, facesMsg);
@@ -242,26 +246,35 @@
}
- public void renderComponentOuterStyles(UIComponent component, FacesContext context, ResponseWriter writer) throws IOException {
+ public void renderComponentOuterStyles(UIComponent component, FacesContext context, ResponseWriter writer, boolean isDisplayNone) throws IOException {
UIRichMessages uiMessages = null;
+ String displayStyle = null;
+
if(!(component instanceof UIRichMessages)){
return;
}
uiMessages = (UIRichMessages)component;
+
+ if(isDisplayNone){
+ displayStyle = "display: none";
+ }
- String parentStyle = (String)uiMessages.getAttributes().get("style");
+ String parentStyle = (String)uiMessages.getAttributes().get("style");
String parentClass = (String)uiMessages.getAttributes().get("styleClass");
-
+
+ if(displayStyle != null){
+ parentStyle = (displayStyle != null) ? displayStyle + ";" + parentStyle : parentStyle;
+ }
+
String richMessageClass = "rich-messages";
-
parentClass = parentClass != null ? (richMessageClass + " " + parentClass) : richMessageClass;
getUtils().writeAttribute(writer, HTML.class_ATTRIBUTE, parentClass);
getUtils().writeAttribute(writer, HTML.style_ATTRIBUTE, parentStyle);
-
+
}
public void renderOuterStyles(UIComponent component, FacesContext context, ResponseWriter writer,
18 years, 7 months
JBoss Rich Faces SVN: r2979 - trunk/samples/rich-message-demo/src/main/webapp/pages.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-09-18 10:54:09 -0400 (Tue, 18 Sep 2007)
New Revision: 2979
Modified:
trunk/samples/rich-message-demo/src/main/webapp/pages/message-demo.xhtml
Log:
remove iterator layout selector
Modified: trunk/samples/rich-message-demo/src/main/webapp/pages/message-demo.xhtml
===================================================================
--- trunk/samples/rich-message-demo/src/main/webapp/pages/message-demo.xhtml 2007-09-18 12:59:19 UTC (rev 2978)
+++ trunk/samples/rich-message-demo/src/main/webapp/pages/message-demo.xhtml 2007-09-18 14:54:09 UTC (rev 2979)
@@ -125,7 +125,6 @@
<h:selectOneMenu id="layout" value="#{message.layout}">
<f:selectItem itemValue="table" itemLabel="table"/>
<f:selectItem itemValue="list" itemLabel="list"/>
- <f:selectItem itemValue="iterator" itemLabel="iterator"/>
</h:selectOneMenu>
</td>
</tr>
18 years, 7 months
JBoss Rich Faces SVN: r2978 - trunk/ui/dataTable/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-09-18 08:59:19 -0400 (Tue, 18 Sep 2007)
New Revision: 2978
Modified:
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
Log:
temporary solution RF-957 (percentage values are not allowed)
Modified: trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
===================================================================
--- trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2007-09-18 11:37:21 UTC (rev 2977)
+++ trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2007-09-18 12:59:19 UTC (rev 2978)
@@ -24,6 +24,7 @@
import java.io.IOException;
import java.util.Iterator;
+import javax.faces.FacesException;
import javax.faces.component.UIColumn;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -50,6 +51,9 @@
* @param table
* @throws IOException
*/
+
+ protected final static String PERSENTAGE_SUPPORT_ERROR_MSG = "columnsWidth property: Percentage values are not supported";
+
public void encodeTableStructure(FacesContext context, UIDataTable table)
throws IOException {
ResponseWriter writer = context.getResponseWriter();
@@ -57,8 +61,13 @@
// Encode colgroup definition.
writer.startElement("colgroup", table);
writer.writeAttribute("span", String.valueOf(columns), null);
- String columnsWidth = (String) table.getAttributes()
- .get("columnsWidth");
+ String columnsWidth = (String) table.getAttributes().get("columnsWidth");
+
+ // temporary solution RF-957
+ if(columnsWidth.contains("%")){
+ throw new FacesException(PERSENTAGE_SUPPORT_ERROR_MSG);
+ }
+
if (null != columnsWidth) {
String[] widths = columnsWidth.split(",");
for (int i = 0; i < widths.length; i++) {
18 years, 7 months
JBoss Rich Faces SVN: r2977 - trunk/ui/dataTable/src/main/resources/org/richfaces/renderkit/html/css.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-09-18 07:37:21 -0400 (Tue, 18 Sep 2007)
New Revision: 2977
Modified:
trunk/ui/dataTable/src/main/resources/org/richfaces/renderkit/html/css/table.xcss
Log:
(RF-535) remove property border-collapse: collapse from .dt-table css class
Modified: trunk/ui/dataTable/src/main/resources/org/richfaces/renderkit/html/css/table.xcss
===================================================================
--- trunk/ui/dataTable/src/main/resources/org/richfaces/renderkit/html/css/table.xcss 2007-09-18 11:03:21 UTC (rev 2976)
+++ trunk/ui/dataTable/src/main/resources/org/richfaces/renderkit/html/css/table.xcss 2007-09-18 11:37:21 UTC (rev 2977)
@@ -12,7 +12,7 @@
<f:verbatim skin="tableBorderColor" />
</u:style>
<u:style name="background-color" skin="tableBackgroundColor" /> <!--tableBackgroundColor-->
- <u:style name="border-collapse" value="collapse" />
+ <!-- <u:style name="border-collapse" value="inherit" /> fix RF-535 -->
</u:selector>
<u:selector name=".dr-table-cell" >
18 years, 7 months
JBoss Rich Faces SVN: r2976 - trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2007-09-18 07:03:21 -0400 (Tue, 18 Sep 2007)
New Revision: 2976
Modified:
trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js
Log:
RF-945
Modified: trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js
===================================================================
--- trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2007-09-18 10:52:58 UTC (rev 2975)
+++ trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2007-09-18 11:03:21 UTC (rev 2976)
@@ -751,7 +751,7 @@
invokeEvent: function(eventName, element, event, date) {
var eventFunction = this.params['on'+eventName];
- var result = true;
+ var result;
if (eventFunction)
{
@@ -781,7 +781,9 @@
catch (e) { LOG.warn("Exception: "+e.Message + "\n[on"+eventName + "]"); }
}
-
+
+ if (result!=false) result = true;
+
return result;
},
18 years, 7 months