JBoss Rich Faces SVN: r624 - trunk/richfaces-samples/dropdownmenu-sample/src/main/webapp/pages.
by richfaces-svn-commits＠lists.jboss.org
Author: d.bulahov
Date: 2007-05-03 06:17:11 -0400 (Thu, 03 May 2007)
New Revision: 624
Modified:
trunk/richfaces-samples/dropdownmenu-sample/src/main/webapp/pages/index.jsp
Log:
http://jira.jboss.com/jira/browse/RF-142?page=all fixed
Modified: trunk/richfaces-samples/dropdownmenu-sample/src/main/webapp/pages/index.jsp
===================================================================
--- trunk/richfaces-samples/dropdownmenu-sample/src/main/webapp/pages/index.jsp 2007-05-03 09:24:15 UTC (rev 623)
+++ trunk/richfaces-samples/dropdownmenu-sample/src/main/webapp/pages/index.jsp 2007-05-03 10:17:11 UTC (rev 624)
@@ -18,7 +18,7 @@
<h:panelGrid id="grid" columns="2" cellspacing="4">
<ddm:dropDownMenu event="#{bean.event}" id="MenuItem1" verticalOffset="#{bean.verticalOffset}" horizontalOffset="#{bean.horizontalOffset}" popupWidth="#{bean.width}" value="Item1" jointPoint="#{bean.jointPoint}" direction="#{bean.direction}">
- <mc:menuItem id="menuItem11" value="Active11: ajax" mode="ajax" actionListener="#{bean.actionListener}"/>
+ <mc:menuItem id="menuItem11" value="Active11: ajax" submitMode="ajax" actionListener="#{bean.actionListener}"/>
<mc:menuItem id="menuItem12" value="Active12" actionListener="#{bean.actionListener}" immediate="true"/>
<mc:menuItem id="menuItem13" value="Active13" action="#{bean.action}" icon="/images/ico1.gif"/>
<mc:menuItem id="menuItem14" value="Active14"/>
@@ -42,7 +42,7 @@
<f:verbatim>Item2</f:verbatim>
</f:facet>
- <mc:menuItem id="menuItem21" value="Active21: none" mode="none"/>
+ <mc:menuItem id="menuItem21" value="Active21: none" submitMode="none"/>
<mc:menuItem id="menuItem22" value="Active22"/>
<mc:menuItem id="menuItem23" value="Active23" icon="/images/node.gif">
<f:facet name="icon">
@@ -73,7 +73,7 @@
<br/>
<br/>
<ddm:dropDownMenu event="#{bean.event}" verticalOffset="#{bean.verticalOffset}" horizontalOffset="#{bean.horizontalOffset}" style="position: absolute; left: 300px; top: 70px; font-size:14px" id="MenuItemAbs1" popupWidth="#{bean.width}" value="Absolute" jointPoint="#{bean.jointPoint}" direction="#{bean.direction}">
- <mc:menuItem id="menuItemAbs11" value="Active11: ajax" mode="ajax" actionListener="#{bean.actionListener}"/>
+ <mc:menuItem id="menuItemAbs11" value="Active11: ajax" submitMode="ajax" actionListener="#{bean.actionListener}"/>
<mc:menuItem id="menuItemAbs12" value="Active12" actionListener="#{bean.actionListener}" immediate="true"/>
<mc:menuItem id="menuItemAbs13" value="Active13" action="#{bean.action}" icon="/images/ico1.gif"/>
<mc:menuItem id="menuItemAbs14" value="Active14"/>
@@ -195,7 +195,7 @@
onmousemove="$('onmousemovei').innerHTML='+'"
onmouseover="$('onmouseoveri').innerHTML='+'"
onselect ="$('onselecti').innerHTML='+'"
- id="menuItemTest11" value="Active11: ajax" mode="ajax" actionListener="#{bean.actionListener}"/>
+ id="menuItemTest11" value="Active11: ajax" submitMode="ajax" actionListener="#{bean.actionListener}"/>
<mc:menuGroup id="menuGroupTest1" value="Group" direction="#{bean.groupDirection}"
onmouseout="$('onmouseoutmg').innerHTML='+'"
onmousemove="$('onmousemovemg').innerHTML='+'"
16 years, 12 months
- 1
- 0
JBoss Rich Faces SVN: r623 - trunk/docs/userguide/en/included.
by richfaces-svn-commits＠lists.jboss.org
Author: vkukharchuk
Date: 2007-05-03 05:24:15 -0400 (Thu, 03 May 2007)
New Revision: 623
Modified:
trunk/docs/userguide/en/included/dataDefinitionList.xml
trunk/docs/userguide/en/included/dragSupport.xml
Log:
Modified: trunk/docs/userguide/en/included/dataDefinitionList.xml
===================================================================
--- trunk/docs/userguide/en/included/dataDefinitionList.xml 2007-05-03 08:46:51 UTC (rev 622)
+++ trunk/docs/userguide/en/included/dataDefinitionList.xml 2007-05-03 09:24:15 UTC (rev 623)
@@ -54,9 +54,10 @@
</section>
<section>
<title>Dynamical Creation from Java Code</title>
- <programlisting role="JAVA"><![CDATA[...
- org.richfaces.component.html.HtmlDataDefinitionList myList = new org.richfaces.component.html.HtmlDataDefinitionList();
+ <programlisting role="JAVA"><![CDATA[import org.richfaces.component.html.HtmlDataDefinitionList;
...
+HtmlDataDefinitionList myList = new HtmlDataDefinitionList();
+...
]]></programlisting>
</section>
<section>
Modified: trunk/docs/userguide/en/included/dragSupport.xml
===================================================================
--- trunk/docs/userguide/en/included/dragSupport.xml 2007-05-03 08:46:51 UTC (rev 622)
+++ trunk/docs/userguide/en/included/dragSupport.xml 2007-05-03 09:24:15 UTC (rev 623)
@@ -73,9 +73,10 @@
<section>
<title>Dynamical Creation from Java Code</title>
- <programlisting role="JAVA">...
- org.richfaces.component.html.HtmlDragSupport myDragZone = new org.richfaces.component.html.HtmlDragSupport();
+ <programlisting role="JAVA">import org.richfaces.component.html.HtmlDragSupport;
...
+HtmlDragSupport myDragZone = new HtmlDragSupport();
+...
</programlisting>
</section>
16 years, 12 months
- 1
- 0
JBoss Rich Faces SVN: r622 - in trunk/docs/userguide/en: modules and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: vkukharchuk
Date: 2007-05-03 04:46:51 -0400 (Thu, 03 May 2007)
New Revision: 622
Modified:
trunk/docs/userguide/en/included/column.xml
trunk/docs/userguide/en/included/columnGroup.xml
trunk/docs/userguide/en/included/dataFilterSlider.xml
trunk/docs/userguide/en/included/dataGrid.xml
trunk/docs/userguide/en/included/dataList.xml
trunk/docs/userguide/en/included/dataOrderedList.xml
trunk/docs/userguide/en/included/dataTable.xml
trunk/docs/userguide/en/included/datascroller.xml
trunk/docs/userguide/en/included/dndParam.xml
trunk/docs/userguide/en/included/dragIndicator.xml
trunk/docs/userguide/en/included/dragIndicator1.xml
trunk/docs/userguide/en/included/dropSupport.xml
trunk/docs/userguide/en/included/gmap.xml
trunk/docs/userguide/en/included/inputNumberSlider.xml
trunk/docs/userguide/en/included/inputNumberSpinner.xml
trunk/docs/userguide/en/included/modalPanel.xml
trunk/docs/userguide/en/included/paint2D.xml
trunk/docs/userguide/en/included/panel.xml
trunk/docs/userguide/en/included/panelBar.xml
trunk/docs/userguide/en/included/panelBarItem.xml
trunk/docs/userguide/en/included/separator.xml
trunk/docs/userguide/en/included/simpleTogglePanel.xml
trunk/docs/userguide/en/included/spacer.xml
trunk/docs/userguide/en/included/subTable.xml
trunk/docs/userguide/en/included/suggestionBox.xml
trunk/docs/userguide/en/included/tab.xml
trunk/docs/userguide/en/included/tabPanel.xml
trunk/docs/userguide/en/included/toggleControl.xml
trunk/docs/userguide/en/included/togglePanel.xml
trunk/docs/userguide/en/included/toolBar.xml
trunk/docs/userguide/en/included/toolBarGroup.xml
trunk/docs/userguide/en/included/tree.xml
trunk/docs/userguide/en/included/treeNode.xml
trunk/docs/userguide/en/modules/RFCtechreqs.xml
Log:
Modified: trunk/docs/userguide/en/included/column.xml
===================================================================
--- trunk/docs/userguide/en/included/column.xml 2007-05-03 07:50:22 UTC (rev 621)
+++ trunk/docs/userguide/en/included/column.xml 2007-05-03 08:46:51 UTC (rev 622)
@@ -57,9 +57,10 @@
</section>
<section>
<title>Dynamical Creation from Java Code</title>
- <programlisting role="JAVA"><![CDATA[...
-org.richfaces.component.html.HtmlColumn myColumn = new org.richfaces.component.html.HtmlColumn();
+ <programlisting role="JAVA"><![CDATA[import org.richfaces.component.html.HtmlColumn;
...
+HtmlColumn myColumn = new HtmlColumn();
+...
]]></programlisting>
</section>
<section>
Modified: trunk/docs/userguide/en/included/columnGroup.xml
===================================================================
--- trunk/docs/userguide/en/included/columnGroup.xml 2007-05-03 07:50:22 UTC (rev 621)
+++ trunk/docs/userguide/en/included/columnGroup.xml 2007-05-03 08:46:51 UTC (rev 622)
@@ -61,8 +61,9 @@
</section>
<section>
<title>Dynamical Creation from Java Code</title>
- <programlisting role="JAVA"><![CDATA[...
-org.richfaces.component.html.HtmlColumnGroup myRow = new org.richfaces.component.html.HtmlColumnGroup();
+ <programlisting role="JAVA"><![CDATA[import org.richfaces.component.html.HtmlColumnGroup;
+...
+HtmlColumnGroup myRow = new HtmlColumnGroup();
...
]]></programlisting>
</section>
Modified: trunk/docs/userguide/en/included/dataFilterSlider.xml
===================================================================
--- trunk/docs/userguide/en/included/dataFilterSlider.xml 2007-05-03 07:50:22 UTC (rev 621)
+++ trunk/docs/userguide/en/included/dataFilterSlider.xml 2007-05-03 08:46:51 UTC (rev 622)
@@ -50,9 +50,10 @@
</section>
<section>
<title>Creating the Component Dynamically Using Java</title>
- <programlisting role="JAVA"><![CDATA[...
-org.richfaces.component.html.HtmldataFilterSlider mySlider = new org.richfaces.component.html.HtmldataFilterSlider();
+ <programlisting role="JAVA"><![CDATA[import org.richfaces.component.html.HtmldataFilterSlider;
...
+HtmldataFilterSlider mySlider = new HtmldataFilterSlider();
+...
]]></programlisting>
</section>
<section>
Modified: trunk/docs/userguide/en/included/dataGrid.xml
===================================================================
--- trunk/docs/userguide/en/included/dataGrid.xml 2007-05-03 07:50:22 UTC (rev 621)
+++ trunk/docs/userguide/en/included/dataGrid.xml 2007-05-03 08:46:51 UTC (rev 622)
@@ -54,9 +54,10 @@
</section>
<section>
<title>Dynamical Creation from Java Code</title>
- <programlisting role="JAVA"><![CDATA[...
-org.richfaces.component.html.HtmlDataGrid myList = new org.richfaces.component.html.HtmlDataGrid();
+ <programlisting role="JAVA"><![CDATA[import org.richfaces.component.html.HtmlDataGrid;
...
+HtmlDataGrid myList = new HtmlDataGrid();
+...
]]></programlisting>
</section>
<section>
Modified: trunk/docs/userguide/en/included/dataList.xml
===================================================================
--- trunk/docs/userguide/en/included/dataList.xml 2007-05-03 07:50:22 UTC (rev 621)
+++ trunk/docs/userguide/en/included/dataList.xml 2007-05-03 08:46:51 UTC (rev 622)
@@ -55,9 +55,10 @@
</section>
<section>
<title>Dynamical Creation from Java Code</title>
- <programlisting role="JAVA"><![CDATA[...
-org.richfaces.component.html.HtmlDataList myList = new org.richfaces.component.html.HtmlDataList();
+ <programlisting role="JAVA"><![CDATA[import org.richfaces.component.html.HtmlDataList;
...
+HtmlDataList myList = new HtmlDataList();
+...
]]></programlisting>
</section>
<section>
Modified: trunk/docs/userguide/en/included/dataOrderedList.xml
===================================================================
--- trunk/docs/userguide/en/included/dataOrderedList.xml 2007-05-03 07:50:22 UTC (rev 621)
+++ trunk/docs/userguide/en/included/dataOrderedList.xml 2007-05-03 08:46:51 UTC (rev 622)
@@ -54,8 +54,9 @@
</section>
<section>
<title>Dynamical Creation from Java Code</title>
- <programlisting role="JAVA"><![CDATA[...
-org.richfaces.component.html.HtmlDataOrderedList myList = new org.richfaces.component.html.HtmlDataOrderedList();
+ <programlisting role="JAVA"><![CDATA[import org.richfaces.component.html.HtmlDataOrderedList;
+...
+HtmlDataOrderedList myList = new HtmlDataOrderedList();
...
]]></programlisting>
</section>
Modified: trunk/docs/userguide/en/included/dataTable.xml
===================================================================
--- trunk/docs/userguide/en/included/dataTable.xml 2007-05-03 07:50:22 UTC (rev 621)
+++ trunk/docs/userguide/en/included/dataTable.xml 2007-05-03 08:46:51 UTC (rev 622)
@@ -56,9 +56,10 @@
</section>
<section>
<title>Dynamical creation from Java code</title>
- <programlisting role="JAVA"><![CDATA[...
-org.richfaces.component.html.HtmlDataTable myTable = new org.richfaces.component.html.HtmlDataTable();
+ <programlisting role="JAVA"><![CDATA[import org.richfaces.component.html.HtmlDataTable;
...
+HtmlDataTable myTable = new HtmlDataTable();
+...
]]></programlisting>
</section>
<section>
Modified: trunk/docs/userguide/en/included/datascroller.xml
===================================================================
--- trunk/docs/userguide/en/included/datascroller.xml 2007-05-03 07:50:22 UTC (rev 621)
+++ trunk/docs/userguide/en/included/datascroller.xml 2007-05-03 08:46:51 UTC (rev 622)
@@ -58,8 +58,9 @@
</section>
<section>
<title>Dynamical creation from Java code</title>
- <programlisting role="JAVA"><![CDATA[...
-org.richfaces.component.html.HtmlDatascroller myScroll = new org.richfaces.component.html.HtmlDatascroller();
+ <programlisting role="JAVA"><![CDATA[import org.richfaces.component.html.HtmlDatascroller;
+...
+HtmlDatascroller myScroll = new HtmlDatascroller();
...
]]></programlisting>
</section>
Modified: trunk/docs/userguide/en/included/dndParam.xml
===================================================================
--- trunk/docs/userguide/en/included/dndParam.xml 2007-05-03 07:50:22 UTC (rev 621)
+++ trunk/docs/userguide/en/included/dndParam.xml 2007-05-03 08:46:51 UTC (rev 622)
@@ -66,9 +66,10 @@
<section>
<title>Creating the Component Dynamically Using Java</title>
- <programlisting role="JAVA">...
-org.richfaces.component.html.HtmlDndParam myDparam = new org.richfaces.component.html.HtmlDndParam();
+ <programlisting role="JAVA">import org.richfaces.component.html.HtmlDndParam;
...
+HtmlDndParam myDparam = new HtmlDndParam();
+...
</programlisting>
</section>
Modified: trunk/docs/userguide/en/included/dragIndicator.xml
===================================================================
--- trunk/docs/userguide/en/included/dragIndicator.xml 2007-05-03 07:50:22 UTC (rev 621)
+++ trunk/docs/userguide/en/included/dragIndicator.xml 2007-05-03 08:46:51 UTC (rev 622)
@@ -61,9 +61,10 @@
</section>
<section>
<title>Creating the Component Dynamically Using Java</title>
- <programlisting role="JAVA"><![CDATA[...
-org.richfaces.component.html.HtmlDragIndicator myDragIndicator = new org.richfaces.component.html.HtmlDragIndicator();
+ <programlisting role="JAVA"><![CDATA[import org.richfaces.component.html.HtmlDragIndicator;
...
+HtmlDragIndicator myDragIndicator = new HtmlDragIndicator();
+...
]]></programlisting>
</section>
<section>
Modified: trunk/docs/userguide/en/included/dragIndicator1.xml
===================================================================
--- trunk/docs/userguide/en/included/dragIndicator1.xml 2007-05-03 07:50:22 UTC (rev 621)
+++ trunk/docs/userguide/en/included/dragIndicator1.xml 2007-05-03 08:46:51 UTC (rev 622)
@@ -60,8 +60,8 @@
</section>
<section>
<title>Creating the Component Dynamically Using Java</title>
- <programlisting role="JAVA"><![CDATA[...
-org.richfaces.component.html.HtmlDragIndicator myDragIndicator = new org.richfaces.component.html.HtmlDragIndicator();
+ <programlisting role="JAVA"><![CDATA[import org.richfaces.component.html.HtmlDragIndicator;
+HtmlDragIndicator myDragIndicator = new HtmlDragIndicator();
...
]]></programlisting>
</section>
Modified: trunk/docs/userguide/en/included/dropSupport.xml
===================================================================
--- trunk/docs/userguide/en/included/dropSupport.xml 2007-05-03 07:50:22 UTC (rev 621)
+++ trunk/docs/userguide/en/included/dropSupport.xml 2007-05-03 08:46:51 UTC (rev 622)
@@ -74,9 +74,10 @@
<section>
<title>Creating the Component Dynamically Using Java</title>
- <programlisting role="JAVA">...
- org.richfaces.component.html.HtmlDropSupport myDragZone = new org.richfaces.component.html.HtmlDropSupport();
+ <programlisting role="JAVA">import org.richfaces.component.html.HtmlDropSupport;
...
+HtmlDropSupport myDragZone = new HtmlDropSupport();
+...
</programlisting>
</section>
Modified: trunk/docs/userguide/en/included/gmap.xml
===================================================================
--- trunk/docs/userguide/en/included/gmap.xml 2007-05-03 07:50:22 UTC (rev 621)
+++ trunk/docs/userguide/en/included/gmap.xml 2007-05-03 08:46:51 UTC (rev 622)
@@ -52,9 +52,10 @@
</section>
<section>
<title>Creating the Component Dynamically Using Java</title>
- <programlisting role="JAVA"><![CDATA[...
-org.richfaces.component.html.HtmlGmap myMap = new org.richfaces.component.html.HtmlGmap();
+ <programlisting role="JAVA"><![CDATA[import org.richfaces.component.html.HtmlGmap;
...
+HtmlGmap myMap = new HtmlGmap();
+...
]]></programlisting>
</section>
<section>
Modified: trunk/docs/userguide/en/included/inputNumberSlider.xml
===================================================================
--- trunk/docs/userguide/en/included/inputNumberSlider.xml 2007-05-03 07:50:22 UTC (rev 621)
+++ trunk/docs/userguide/en/included/inputNumberSlider.xml 2007-05-03 08:46:51 UTC (rev 622)
@@ -52,9 +52,10 @@
</section>
<section>
<title>Creating the Component Dynamically Using Java</title>
- <programlisting role="JAVA"><![CDATA[...
-org.richfaces.component.html.HtmlInputNumberSlider mySlider = new org.richfaces.component.html.HtmlInputNumberSlider();
+ <programlisting role="JAVA"><![CDATA[import org.richfaces.component.html.HtmlInputNumberSlider;
...
+HtmlInputNumberSlider mySlider = new HtmlInputNumberSlider();
+...
]]></programlisting>
</section>
<section>
Modified: trunk/docs/userguide/en/included/inputNumberSpinner.xml
===================================================================
--- trunk/docs/userguide/en/included/inputNumberSpinner.xml 2007-05-03 07:50:22 UTC (rev 621)
+++ trunk/docs/userguide/en/included/inputNumberSpinner.xml 2007-05-03 08:46:51 UTC (rev 622)
@@ -52,9 +52,10 @@
</section>
<section>
<title>Creating the Component Dynamically Using Java</title>
- <programlisting role="JAVA"><![CDATA[...
-org.richfaces.component.html.HtmlInputNumberSpinner mySpinner = new org.richfaces.component.html.HtmlInputNumberSpinner ();
+ <programlisting role="JAVA"><![CDATA[import org.richfaces.component.html.HtmlInputNumberSpinner;
...
+HtmlInputNumberSpinner mySpinner = new HtmlInputNumberSpinner ();
+...
]]></programlisting>
</section>
<section>
Modified: trunk/docs/userguide/en/included/modalPanel.xml
===================================================================
--- trunk/docs/userguide/en/included/modalPanel.xml 2007-05-03 07:50:22 UTC (rev 621)
+++ trunk/docs/userguide/en/included/modalPanel.xml 2007-05-03 08:46:51 UTC (rev 622)
@@ -80,9 +80,10 @@
<section>
<title>Creating the Component Dynamically Using Java</title>
- <programlisting role="JAVA">...
- org.richfaces.component.html.HtmlModalPanel myPanel = new org.richfaces.component.html.HtmlModalPanel();
+ <programlisting role="JAVA">import org.richfaces.component.html.HtmlModalPanel;
...
+HtmlModalPanel myPanel = new HtmlModalPanel();
+...
</programlisting>
</section>
Modified: trunk/docs/userguide/en/included/paint2D.xml
===================================================================
--- trunk/docs/userguide/en/included/paint2D.xml 2007-05-03 07:50:22 UTC (rev 621)
+++ trunk/docs/userguide/en/included/paint2D.xml 2007-05-03 08:46:51 UTC (rev 622)
@@ -58,9 +58,10 @@
</section>
<section>
<title>Creating the Component Dynamically Using Java</title>
- <programlisting role="JAVA"><![CDATA[...
-org.richfaces.component.html.HtmlPaint2D myImage = new org.richfaces.component.html.HtmlPaint2D();
+ <programlisting role="JAVA"><![CDATA[import org.richfaces.component.html.HtmlPaint2D;
...
+HtmlPaint2D myImage = new HtmlPaint2D();
+...
]]></programlisting>
</section>
<section>
Modified: trunk/docs/userguide/en/included/panel.xml
===================================================================
--- trunk/docs/userguide/en/included/panel.xml 2007-05-03 07:50:22 UTC (rev 621)
+++ trunk/docs/userguide/en/included/panel.xml 2007-05-03 08:46:51 UTC (rev 622)
@@ -58,9 +58,10 @@
</section>
<section>
<title>Creating the Component Dynamically Using Java</title>
- <programlisting role="JAVA"><![CDATA[...
-org.richfaces.component.html.HtmlPanel myPanel = new org.richfaces.component.html.HtmlPanel();
+ <programlisting role="JAVA"><![CDATA[import org.richfaces.component.html.HtmlPanel;
...
+HtmlPanel myPanel = new HtmlPanel();
+...
]]></programlisting>
</section>
<section>
Modified: trunk/docs/userguide/en/included/panelBar.xml
===================================================================
--- trunk/docs/userguide/en/included/panelBar.xml 2007-05-03 07:50:22 UTC (rev 621)
+++ trunk/docs/userguide/en/included/panelBar.xml 2007-05-03 08:46:51 UTC (rev 622)
@@ -60,9 +60,10 @@
</section>
<section>
<title>Creating the Component Dynamically Using Java</title>
- <programlisting role="JAVA"><![CDATA[...
-org.richfaces.component.html.HtmlPanelBar myBar = new org.richfaces.component.html.HtmlPanelBar();
+ <programlisting role="JAVA"><![CDATA[import org.richfaces.component.html.HtmlPanelBar;
...
+HtmlPanelBar myBar = new HtmlPanelBar();
+...
]]></programlisting>
</section>
<section>
Modified: trunk/docs/userguide/en/included/panelBarItem.xml
===================================================================
--- trunk/docs/userguide/en/included/panelBarItem.xml 2007-05-03 07:50:22 UTC (rev 621)
+++ trunk/docs/userguide/en/included/panelBarItem.xml 2007-05-03 08:46:51 UTC (rev 622)
@@ -59,9 +59,10 @@
</section>
<section>
<title>Creating the Component Dynamically Using Java</title>
- <programlisting role="JAVA"><![CDATA[...
-org.richfaces.component.html.HtmlPanelBarItem myBarItem = new org.richfaces.component.html.HtmlPanelBarItem();
+ <programlisting role="JAVA"><![CDATA[import org.richfaces.component.html.HtmlPanelBarItem;
...
+HtmlPanelBarItem myBarItem = new HtmlPanelBarItem();
+...
]]></programlisting>
</section>
<section>
Modified: trunk/docs/userguide/en/included/separator.xml
===================================================================
--- trunk/docs/userguide/en/included/separator.xml 2007-05-03 07:50:22 UTC (rev 621)
+++ trunk/docs/userguide/en/included/separator.xml 2007-05-03 08:46:51 UTC (rev 622)
@@ -52,9 +52,10 @@
</section>
<section>
<title>Creating the Component Dynamically Using Java</title>
- <programlisting role="JAVA"><![CDATA[...
-org.richfaces.component.html.HtmlSeparator mySeparator = new org.richfaces.component.html.HtmlSeparator();
+ <programlisting role="JAVA"><![CDATA[import org.richfaces.component.html.HtmlSeparator;
...
+HtmlSeparator mySeparator = new HtmlSeparator();
+...
]]></programlisting>
</section>
<section>
Modified: trunk/docs/userguide/en/included/simpleTogglePanel.xml
===================================================================
--- trunk/docs/userguide/en/included/simpleTogglePanel.xml 2007-05-03 07:50:22 UTC (rev 621)
+++ trunk/docs/userguide/en/included/simpleTogglePanel.xml 2007-05-03 08:46:51 UTC (rev 622)
@@ -55,9 +55,10 @@
</section>
<section>
<title>Creating the Component Dynamically Using Java</title>
- <programlisting role="JAVA"><![CDATA[...
-org.richfaces.component.html.HtmlSimpleTogglePanel myPanel = new org.richfaces.component.html.HtmlSimpleTogglePanel();
+ <programlisting role="JAVA"><![CDATA[import org.richfaces.component.html.HtmlSimpleTogglePanel;
...
+HtmlSimpleTogglePanel myPanel = new HtmlSimpleTogglePanel();
+...
]]></programlisting>
</section>
<section>
Modified: trunk/docs/userguide/en/included/spacer.xml
===================================================================
--- trunk/docs/userguide/en/included/spacer.xml 2007-05-03 07:50:22 UTC (rev 621)
+++ trunk/docs/userguide/en/included/spacer.xml 2007-05-03 08:46:51 UTC (rev 622)
@@ -51,9 +51,10 @@
</section>
<section>
<title>Creating the Component Dynamically Using Java</title>
- <programlisting role="JAVA"><![CDATA[...
-org.richfaces.component.html.HtmlSpacer mySpacer = new org.richfaces.component.html.HtmlSpacer();
+ <programlisting role="JAVA"><![CDATA[import org.richfaces.component.html.HtmlSpacer;
...
+HtmlSpacer mySpacer = new HtmlSpacer();
+...
]]></programlisting>
</section>
<section>
Modified: trunk/docs/userguide/en/included/subTable.xml
===================================================================
--- trunk/docs/userguide/en/included/subTable.xml 2007-05-03 07:50:22 UTC (rev 621)
+++ trunk/docs/userguide/en/included/subTable.xml 2007-05-03 08:46:51 UTC (rev 622)
@@ -56,9 +56,10 @@
</section>
<section>
<title>Creating the Component Dynamically Using Java</title>
- <programlisting role="JAVA"><![CDATA[...
-org.richfaces.component.html.HtmlSubTable mySubTable = new org.richfaces.component.html.HtmlSubTable();
+ <programlisting role="JAVA"><![CDATA[import org.richfaces.component.html.HtmlSubTable;
...
+HtmlSubTable mySubTable = new HtmlSubTable();
+...
]]></programlisting>
</section>
<section>
Modified: trunk/docs/userguide/en/included/suggestionBox.xml
===================================================================
--- trunk/docs/userguide/en/included/suggestionBox.xml 2007-05-03 07:50:22 UTC (rev 621)
+++ trunk/docs/userguide/en/included/suggestionBox.xml 2007-05-03 08:46:51 UTC (rev 622)
@@ -67,9 +67,10 @@
</section>
<section>
<title>Creating the Component Dynamically Using Java</title>
- <programlisting role="JAVA"><![CDATA[...
-org.richfaces.component.html.HtmlSuggestionBox myList = new org.richfaces.component.html.HtmlSuggestionBox();
+ <programlisting role="JAVA"><![CDATA[import org.richfaces.component.html.HtmlSuggestionBox;
...
+HtmlSuggestionBox myList = new HtmlSuggestionBox();
+...
]]></programlisting>
</section>
<section>
Modified: trunk/docs/userguide/en/included/tab.xml
===================================================================
--- trunk/docs/userguide/en/included/tab.xml 2007-05-03 07:50:22 UTC (rev 621)
+++ trunk/docs/userguide/en/included/tab.xml 2007-05-03 08:46:51 UTC (rev 622)
@@ -56,8 +56,9 @@
</section>
<section>
<title>Creating the Component Dynamically Using Java</title>
- <programlisting role="JAVA"><![CDATA[...
-org.richfaces.component.html.HtmlTab myTab = new org.richfaces.component.html.HtmlTab();
+ <programlisting role="JAVA"><![CDATA[import org.richfaces.component.html.HtmlTab;
+...
+HtmlTab myTab = new HtmlTab();
...
]]></programlisting>
</section>
Modified: trunk/docs/userguide/en/included/tabPanel.xml
===================================================================
--- trunk/docs/userguide/en/included/tabPanel.xml 2007-05-03 07:50:22 UTC (rev 621)
+++ trunk/docs/userguide/en/included/tabPanel.xml 2007-05-03 08:46:51 UTC (rev 622)
@@ -58,8 +58,9 @@
</section>
<section>
<title>Creating the Component Dynamically Using Java</title>
- <programlisting role="JAVA"><![CDATA[...
-org.richfaces.component.html.HtmlTabPanel myTabPanel = new org.richfaces.component.html.HtmlTabPanel();
+ <programlisting role="JAVA"><![CDATA[import org.richfaces.component.html.HtmlTabPanel;
+...
+HtmlTabPanel myTabPanel = new HtmlTabPanel();
...
]]></programlisting>
</section>
Modified: trunk/docs/userguide/en/included/toggleControl.xml
===================================================================
--- trunk/docs/userguide/en/included/toggleControl.xml 2007-05-03 07:50:22 UTC (rev 621)
+++ trunk/docs/userguide/en/included/toggleControl.xml 2007-05-03 08:46:51 UTC (rev 622)
@@ -56,9 +56,10 @@
</section>
<section>
<title>Creating the Component Dynamically Using Java</title>
- <programlisting role="JAVA"><![CDATA[...
-org.richfaces.component.html.HtmlToggleControl myControl = new org.richfaces.component.html.HtmlToggleControl();
+ <programlisting role="JAVA"><![CDATA[import org.richfaces.component.html.HtmlToggleControl;
...
+HtmlToggleControl myControl = new HtmlToggleControl();
+...
]]></programlisting>
</section>
<section>
Modified: trunk/docs/userguide/en/included/togglePanel.xml
===================================================================
--- trunk/docs/userguide/en/included/togglePanel.xml 2007-05-03 07:50:22 UTC (rev 621)
+++ trunk/docs/userguide/en/included/togglePanel.xml 2007-05-03 08:46:51 UTC (rev 622)
@@ -62,8 +62,9 @@
</section>
<section>
<title>Creating the Component Dynamically Using Java</title>
- <programlisting role="JAVA"><![CDATA[...
-org.richfaces.component.html.HtmlTogglePanel myPanel = new org.richfaces.component.html.HtmlTogglePanel();
+ <programlisting role="JAVA"><![CDATA[import org.richfaces.component.html.HtmlTogglePanel;
+...
+HtmlTogglePanel myPanel = new HtmlTogglePanel();
...
]]></programlisting>
</section>
Modified: trunk/docs/userguide/en/included/toolBar.xml
===================================================================
--- trunk/docs/userguide/en/included/toolBar.xml 2007-05-03 07:50:22 UTC (rev 621)
+++ trunk/docs/userguide/en/included/toolBar.xml 2007-05-03 08:46:51 UTC (rev 622)
@@ -52,9 +52,10 @@
</section>
<section>
<title>Creating the Component Dynamically Using Java</title>
- <programlisting role="JAVA"><![CDATA[...
-org.richfaces.component.html.HtmlToolBar myToolBar = new org.richfaces.component.html.HtmlToolBar();
+ <programlisting role="JAVA"><![CDATA[import org.richfaces.component.html.HtmlToolBar;
...
+HtmlToolBar myToolBar = new HtmlToolBar();
+...
]]></programlisting>
</section>
<section>
Modified: trunk/docs/userguide/en/included/toolBarGroup.xml
===================================================================
--- trunk/docs/userguide/en/included/toolBarGroup.xml 2007-05-03 07:50:22 UTC (rev 621)
+++ trunk/docs/userguide/en/included/toolBarGroup.xml 2007-05-03 08:46:51 UTC (rev 622)
@@ -60,9 +60,10 @@
</section>
<section>
<title>Creating the Component Dynamically Using Java</title>
- <programlisting role="JAVA"><![CDATA[...
-org.richfaces.component.html.HtmlToolBarGroup myToolBarGroup = new org.richfaces.component.html.HtmlToolBarGroup();
+ <programlisting role="JAVA"><![CDATA[import org.richfaces.component.html.HtmlToolBarGroup;
...
+HtmlToolBarGroup myToolBarGroup = new HtmlToolBarGroup();
+...
]]></programlisting>
</section>
<section>
Modified: trunk/docs/userguide/en/included/tree.xml
===================================================================
--- trunk/docs/userguide/en/included/tree.xml 2007-05-03 07:50:22 UTC (rev 621)
+++ trunk/docs/userguide/en/included/tree.xml 2007-05-03 08:46:51 UTC (rev 622)
@@ -54,9 +54,10 @@
</section>
<section>
<title>Creating the Component Dynamically Using Java</title>
- <programlisting role="JAVA"><![CDATA[...
-org.richfaces.component.html.HtmlTree myPanel = new org.richfaces.component.html.HtmlTree();
+ <programlisting role="JAVA"><![CDATA[import org.richfaces.component.html.HtmlTree;
...
+HtmlTree myPanel = new HtmlTree();
+...
]]></programlisting>
</section>
<section>
Modified: trunk/docs/userguide/en/included/treeNode.xml
===================================================================
--- trunk/docs/userguide/en/included/treeNode.xml 2007-05-03 07:50:22 UTC (rev 621)
+++ trunk/docs/userguide/en/included/treeNode.xml 2007-05-03 08:46:51 UTC (rev 622)
@@ -56,9 +56,10 @@
</section>
<section>
<title>Dynamical Creation from Java Code</title>
- <programlisting role="JAVA"><![CDATA[...
-org.richfaces.component.html.HtmlTreeNode myPanel = new org.richfaces.component.html.HtmlTreeNode();
+ <programlisting role="JAVA"><![CDATA[import org.richfaces.component.html.HtmlTreeNode;
...
+HtmlTreeNode myPanel = new HtmlTreeNode();
+...
]]></programlisting>
</section>
<section>
Modified: trunk/docs/userguide/en/modules/RFCtechreqs.xml
===================================================================
--- trunk/docs/userguide/en/modules/RFCtechreqs.xml 2007-05-03 07:50:22 UTC (rev 621)
+++ trunk/docs/userguide/en/modules/RFCtechreqs.xml 2007-05-03 08:46:51 UTC (rev 622)
@@ -36,7 +36,7 @@
<keyword>JBoss 3.2 - 4.0.x</keyword>
- <keyword>Internet Explorer 5.0 - 7.0</keyword>
+ <keyword>Internet Explorer 6.0 - 7.0</keyword>
<keyword>Firefox 1.0 - 2.0</keyword>
16 years, 12 months
- 1
- 0
JBoss Rich Faces SVN: r621 - trunk/richfaces/dropdown-menu/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: d.bulahov
Date: 2007-05-03 03:50:22 -0400 (Thu, 03 May 2007)
New Revision: 621
Modified:
trunk/richfaces/dropdown-menu/src/main/config/component/dropdownmenu.xml
Log:
http://jira.jboss.com/jira/browse/RF-140?page=all fixed
Modified: trunk/richfaces/dropdown-menu/src/main/config/component/dropdownmenu.xml
===================================================================
--- trunk/richfaces/dropdown-menu/src/main/config/component/dropdownmenu.xml 2007-05-03 03:19:26 UTC (rev 620)
+++ trunk/richfaces/dropdown-menu/src/main/config/component/dropdownmenu.xml 2007-05-03 07:50:22 UTC (rev 621)
@@ -56,7 +56,7 @@
<description>
Delay between event and menu showing.
</description>
- <defaultvalue><![CDATA[new Integer(300)]]></defaultvalue>
+ <defaultvalue><![CDATA[new Integer(50)]]></defaultvalue>
</property>
<property>
@@ -65,7 +65,7 @@
<description>
Delay between losing focus and menu closing.
</description>
- <defaultvalue><![CDATA[new Integer(300)]]></defaultvalue>
+ <defaultvalue><![CDATA[new Integer(800)]]></defaultvalue>
</property>
<property>
16 years, 12 months
- 1
- 0
JBoss Rich Faces SVN: r620 - in trunk/richfaces: datascroller/src/test/java/org/richfaces/component and 4 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-05-02 23:19:26 -0400 (Wed, 02 May 2007)
New Revision: 620
Modified:
trunk/richfaces/dataFilterSlider/src/test/java/org/richfaces/component/DataFilterSliderComponentTest.java
trunk/richfaces/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java
trunk/richfaces/drag-drop/src/test/java/org/richfaces/component/DragDropTest.java
trunk/richfaces/dropdown-menu/src/test/java/org/richfaces/component/DropDownMenuComponentTest.java
trunk/richfaces/gmap/src/test/java/org/richfaces/component/GmapComponentTest.java
trunk/richfaces/tree/src/test/java/org/richfaces/component/TreeComponentTest.java
Log:
Unit tests updated
Modified: trunk/richfaces/dataFilterSlider/src/test/java/org/richfaces/component/DataFilterSliderComponentTest.java
===================================================================
--- trunk/richfaces/dataFilterSlider/src/test/java/org/richfaces/component/DataFilterSliderComponentTest.java 2007-05-03 02:34:26 UTC (rev 619)
+++ trunk/richfaces/dataFilterSlider/src/test/java/org/richfaces/component/DataFilterSliderComponentTest.java 2007-05-03 03:19:26 UTC (rev 620)
@@ -80,9 +80,9 @@
*/
static {
- javaScripts.add("prototype.js");
+ javaScripts.add("org.ajax4jsf.framework.resource.PrototypeScript");
javaScripts.add("org.ajax4jsf.framework.ajax.AjaxScript");
- javaScripts.add("org/richfaces/renderkit/html/scripts/scriptaculous-js-1.6.5/src/slider.js");
+ javaScripts.add("scripts/scriptaculous-js-1.6.5/src/slider.js");
}
public DataFilterSliderComponentTest(String testName) {
@@ -157,7 +157,7 @@
public void testRenderImages() throws Exception {
renderView();
InternetResourceBuilder builder = ResourceBuilderImpl.getInstance();
- InternetResource resource = builder.getResource("org/richfaces/renderkit/html/css/dataFilterSlider.xcss");
+ InternetResource resource = builder.getResource("css/dataFilterSlider.xcss");
assertNotNull(resource);
String uri = "http:" + resource.getUri(facesContext, null);
Page page = webClient.getPage(uri);
@@ -195,7 +195,7 @@
List links = page.getDocumentElement().getHtmlElementsByTagName("link");
assertEquals(1, links.size());
HtmlElement link = (HtmlElement) links.get(0);
- assertTrue(link.getAttributeValue("href").contains("org/richfaces/renderkit/html/css/dataFilterSlider.xcss"));
+ assertTrue(link.getAttributeValue("href").contains("css/dataFilterSlider.xcss"));
}
public void testRenderScript() throws Exception {
Modified: trunk/richfaces/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java
===================================================================
--- trunk/richfaces/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java 2007-05-03 02:34:26 UTC (rev 619)
+++ trunk/richfaces/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java 2007-05-03 03:19:26 UTC (rev 620)
@@ -57,7 +57,7 @@
static {
javaScripts.add("org.ajax4jsf.framework.ajax.AjaxScript");
- javaScripts.add("prototype.js");
+ javaScripts.add("org.ajax4jsf.framework.resource.PrototypeScript");
}
private UIDatascroller scroller;
@@ -247,7 +247,7 @@
assertEquals(1, links.size());
HtmlElement link = (HtmlElement) links.get(0);
- assertTrue(link.getAttributeValue("href").contains("org/richfaces/renderkit/html/css/datascroller.xcss"));
+ assertTrue(link.getAttributeValue("href").contains("css/datascroller.xcss"));
}
/**
Modified: trunk/richfaces/drag-drop/src/test/java/org/richfaces/component/DragDropTest.java
===================================================================
--- trunk/richfaces/drag-drop/src/test/java/org/richfaces/component/DragDropTest.java 2007-05-03 02:34:26 UTC (rev 619)
+++ trunk/richfaces/drag-drop/src/test/java/org/richfaces/component/DragDropTest.java 2007-05-03 03:19:26 UTC (rev 620)
@@ -40,24 +40,25 @@
private static Set javaScripts = new HashSet();
static {
- javaScripts.add("prototype.js");
+ javaScripts.add("org.ajax4jsf.framework.resource.PrototypeScript");
javaScripts.add("org.ajax4jsf.framework.ajax.AjaxScript");
- javaScripts.add("org/richfaces/renderkit/html/scripts/browser_info.js");
- javaScripts.add("/a4j.res/dnd.js");
- javaScripts.add("org/richfaces/renderkit/html/scripts/events.js");
+ javaScripts.add("scripts/browser_info.js");
+ javaScripts.add("org.ajax4jsf.dnd.DnDScript");
+ javaScripts.add("scripts/events.js");
+ javaScripts.add("scripts/utils.js");
javaScripts
- .add("/org/richfaces/renderkit/html/scripts/simple-draggable.js");
+ .add("scripts/simple-draggable.js");
javaScripts
- .add("/org/richfaces/renderkit/html/scripts/simple-dropzone.js");
- javaScripts.add("/org/richfaces/renderkit/html/scripts/json/json.js");
+ .add("scripts/simple-dropzone.js");
+ javaScripts.add("scripts/json/json.js");
javaScripts
- .add("/org/richfaces/renderkit/html/scripts/dnd/dnd-common.js");
+ .add("scripts/dnd/dnd-common.js");
javaScripts
- .add("/org/richfaces/renderkit/html/scripts/dnd/dnd-dropzone.js");
+ .add("scripts/dnd/dnd-dropzone.js");
javaScripts
- .add("/org/richfaces/renderkit/html/scripts/dnd/dnd-draggable.js");
+ .add("scripts/dnd/dnd-draggable.js");
javaScripts
- .add("/org/richfaces/renderkit/html/scripts/drag-indicator.js");
+ .add("scripts/drag-indicator.js");
}
private static Set eventsSet = new HashSet();
static {
Modified: trunk/richfaces/dropdown-menu/src/test/java/org/richfaces/component/DropDownMenuComponentTest.java
===================================================================
--- trunk/richfaces/dropdown-menu/src/test/java/org/richfaces/component/DropDownMenuComponentTest.java 2007-05-03 02:34:26 UTC (rev 619)
+++ trunk/richfaces/dropdown-menu/src/test/java/org/richfaces/component/DropDownMenuComponentTest.java 2007-05-03 03:19:26 UTC (rev 620)
@@ -50,7 +50,7 @@
private static Set javaScripts = new HashSet();
static {
- javaScripts.add("prototype.js");
+ javaScripts.add("org.ajax4jsf.framework.resource.PrototypeScript");
javaScripts.add("org.ajax4jsf.framework.ajax.AjaxScript");
javaScripts.add("org.ajax4jsf.framework.util.command.CommandScript");
javaScripts.add("scripts/menu.js");
@@ -184,7 +184,7 @@
List links = page.getDocumentElement().getHtmlElementsByTagName("link");
assertEquals(2, links.size());
HtmlElement link = (HtmlElement) links.get(0);
- assertTrue(link.getAttributeValue("href").contains("org/richfaces/renderkit/html/css/dropdownmenu.xcss"));
+ assertTrue(link.getAttributeValue("href").contains("css/dropdownmenu.xcss"));
}
/**
@@ -217,7 +217,7 @@
public void testRenderImages() throws Exception {
renderView();
InternetResourceBuilder builder = ResourceBuilderImpl.getInstance();
- InternetResource resource = builder.getResource("org/richfaces/renderkit/html/css/dropdownmenu.xcss");
+ InternetResource resource = builder.getResource("css/dropdownmenu.xcss");
assertNotNull(resource);
String uri = "http:" + resource.getUri(facesContext, null);
Page page = webClient.getPage(uri);
Modified: trunk/richfaces/gmap/src/test/java/org/richfaces/component/GmapComponentTest.java
===================================================================
--- trunk/richfaces/gmap/src/test/java/org/richfaces/component/GmapComponentTest.java 2007-05-03 02:34:26 UTC (rev 619)
+++ trunk/richfaces/gmap/src/test/java/org/richfaces/component/GmapComponentTest.java 2007-05-03 03:19:26 UTC (rev 620)
@@ -26,11 +26,6 @@
import java.util.List;
import java.util.Set;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import javax.faces.component.UICommand;
import javax.faces.component.UIComponent;
import javax.faces.component.UIForm;
import javax.faces.component.html.HtmlForm;
@@ -38,8 +33,6 @@
import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
import org.apache.commons.lang.StringUtils;
-import com.gargoylesoftware.htmlunit.html.DomNode;
-import com.gargoylesoftware.htmlunit.html.DomText;
import com.gargoylesoftware.htmlunit.html.HtmlElement;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
import com.gargoylesoftware.htmlunit.html.HtmlScript;
@@ -55,7 +48,7 @@
private final static String TEST_STYLE = "width:500px; height:400px";
static {
- javaScripts.add("prototype.js");
+ javaScripts.add("org.ajax4jsf.framework.resource.PrototypeScript");
javaScripts.add("org.ajax4jsf.framework.ajax.AjaxScript");
javaScripts.add("script/gmap.js");
javaScripts.add("http://maps.google.com");
@@ -115,7 +108,7 @@
assertEquals(1, links.size());
HtmlElement link = (HtmlElement) links.get(0);
- assertTrue(link.getAttributeValue("href").contains("org/richfaces/renderkit/html/css/gmap.xcss"));
+ assertTrue(link.getAttributeValue("href").contains("css/gmap.xcss"));
}
public void testRenderScript() throws Exception {
Modified: trunk/richfaces/tree/src/test/java/org/richfaces/component/TreeComponentTest.java
===================================================================
--- trunk/richfaces/tree/src/test/java/org/richfaces/component/TreeComponentTest.java 2007-05-03 02:34:26 UTC (rev 619)
+++ trunk/richfaces/tree/src/test/java/org/richfaces/component/TreeComponentTest.java 2007-05-03 03:19:26 UTC (rev 620)
@@ -72,15 +72,17 @@
static {
javaScripts.add("/org/richfaces/renderkit/html/scripts/json/json.js");
- javaScripts.add("prototype.js");
- javaScripts.add("dnd.js");
+
+ javaScripts.add("org.ajax4jsf.framework.resource.PrototypeScript");
+ javaScripts.add("scripts/AJAX.js");
+ javaScripts.add("org.ajax4jsf.dnd.DnDScript");
+
javaScripts.add("/org/richfaces/renderkit/html/scripts/utils.js");
javaScripts.add("/org/richfaces/renderkit/html/scripts/dnd/dnd-common.js");
javaScripts.add("/org/richfaces/renderkit/html/scripts/dnd/dnd-draggable.js");
javaScripts.add("/org/richfaces/renderkit/html/scripts/dnd/dnd-dropzone.js");
- javaScripts.add("/org/ajax4jsf/framework/ajax/scripts/AJAX.js");
javaScripts.add("/org/ajax4jsf/renderkit/html/scripts/form.js");
javaScripts.add("/org/richfaces/renderkit/html/scripts/events.js");
javaScripts.add("/org/richfaces/renderkit/html/scripts/tree.js");
@@ -94,8 +96,8 @@
private static Set cssStyles = new HashSet();
static {
- cssStyles.add("/org/richfaces/renderkit/html/css/dragIndicator.xcss");
- cssStyles.add("/org/richfaces/renderkit/html/css/tree.xcss");
+ cssStyles.add("css/dragIndicator.xcss");
+ cssStyles.add("css/tree.xcss");
}
private UICommand command = null;
@@ -247,7 +249,7 @@
public void testRenderImages() throws Exception {
renderView();
InternetResourceBuilder builder = ResourceBuilderImpl.getInstance();
- InternetResource resource = builder.getResource("org/richfaces/renderkit/html/css/tree.xcss");
+ InternetResource resource = builder.getResource("css/tree.xcss");
assertNotNull(resource);
String uri = "http:" + resource.getUri(facesContext, null);
Page page = webClient.getPage(uri);
16 years, 12 months
- 1
- 0
JBoss Rich Faces SVN: r619 - in trunk/richfaces: tabPanel/src/main/java/org/richfaces/component and 3 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-05-02 22:34:26 -0400 (Wed, 02 May 2007)
New Revision: 619
Removed:
trunk/richfaces/tabPanel/src/main/java/org/richfaces/model/Tab.java
trunk/richfaces/tabPanel/src/test/java/org/richfaces/model/TabTest.java
Modified:
trunk/richfaces/drag-drop/src/main/java/org/richfaces/component/UIDragIndicator.java
trunk/richfaces/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java
trunk/richfaces/tabPanel/src/main/java/org/richfaces/renderkit/TabHeaderRendererBase.java
Log:
Orphan functions killed, imports optimized
Modified: trunk/richfaces/drag-drop/src/main/java/org/richfaces/component/UIDragIndicator.java
===================================================================
--- trunk/richfaces/drag-drop/src/main/java/org/richfaces/component/UIDragIndicator.java 2007-05-03 01:43:26 UTC (rev 618)
+++ trunk/richfaces/drag-drop/src/main/java/org/richfaces/component/UIDragIndicator.java 2007-05-03 02:34:26 UTC (rev 619)
@@ -68,23 +68,4 @@
public static final String DEFAULT_INDICATOR_ID = "_dragIndicator";
- public static UIDragIndicator getDefaultIndicator() {
- FacesContext facesContext = FacesContext.getCurrentInstance();
- Application application = facesContext.getApplication();
-
- UIDragIndicator indicator = (UIDragIndicator) application.createComponent(UIDragIndicator.COMPONENT_TYPE);
- indicator.setId(DEFAULT_INDICATOR_ID);
- indicator.setTransient(true);
- Map facets = indicator.getFacets();
-
- UIOutput single = (UIOutput) application.createComponent(UIOutput.COMPONENT_TYPE);
- single.setValue("Single item");
- facets.put("single", single);
-
- UIOutput multi = (UIOutput) application.createComponent(UIOutput.COMPONENT_TYPE);
- multi.setValue("{count} items");
- facets.put("multi", multi);
-
- return indicator;
- }
}
Modified: trunk/richfaces/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java
===================================================================
--- trunk/richfaces/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java 2007-05-03 01:43:26 UTC (rev 618)
+++ trunk/richfaces/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java 2007-05-03 02:34:26 UTC (rev 619)
@@ -21,10 +21,9 @@
package org.richfaces.component;
-import org.richfaces.model.Tab;
+import java.util.Iterator;
import javax.faces.component.UIComponent;
-import java.util.Iterator;
/**
* JSF component class
Deleted: trunk/richfaces/tabPanel/src/main/java/org/richfaces/model/Tab.java
===================================================================
--- trunk/richfaces/tabPanel/src/main/java/org/richfaces/model/Tab.java 2007-05-03 01:43:26 UTC (rev 618)
+++ trunk/richfaces/tabPanel/src/main/java/org/richfaces/model/Tab.java 2007-05-03 02:34:26 UTC (rev 619)
@@ -1,152 +0,0 @@
-/**
- * License Agreement.
- *
- * JBoss RichFaces 3.0 - Ajax4jsf Component Library
- *
- * Copyright (C) 2007 Exadel, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-package org.richfaces.model;
-
-/**
- * Tab model bean represent a single tab in list of tabs for panel.
- *
- * @author shura (latest modification by $Author: ishabalov $)
- * @version $Revision: 1.3 $ $Date: 2007/02/21 20:35:05 $
- */
-public class Tab implements TabModel {
-
- private Object _name;
- private String _label;
- private boolean _disabled;
- private String _labelWidth;
- private String _switchType;
- private String _title;
-
- /**
- * No-argument constructor for JavaBean contract.
- */
- public Tab() {
- super();
- }
-
- public Tab(Object value) {
- this(value, value.toString(), false, null, null);
- }
-
- /**
- * @param value
- * @param label
- * @param disabled
- * @param labelWidth
- * @param title
- */
- public Tab(Object value, String label, boolean disabled, String labelWidth, String title) {
- super();
- this._name = value;
- this._label = label;
- this._disabled = disabled;
- this._labelWidth = labelWidth;
- this._title = title;
- }
-
- /**
- * @return Returns the disabled.
- */
- public boolean isDisabled() {
- return this._disabled;
- }
-
- /**
- * @param disabled The disabled to set.
- */
- public void setDisabled(boolean disabled) {
- this._disabled = disabled;
- }
-
- /**
- * @return Returns the label.
- */
- public String getLabel() {
- return this._label;
- }
-
- /**
- * @param label The label to set.
- */
- public void setLabel(String label) {
- this._label = label;
- }
-
- /**
- * @return Returns the labelWidth.
- */
- public String getLabelWidth() {
- return this._labelWidth;
- }
-
- /**
- * @param labelWidth The labelWidth to set.
- */
- public void setLabelWidth(String labelWidth) {
- this._labelWidth = labelWidth;
- }
-
- /**
- * @return Returns the value.
- */
- public Object getName() {
- return this._name;
- }
-
- /**
- * @param value The value to set.
- */
- public void setName(Object value) {
- if (value == null) {
- throw new NullPointerException("value for tab set to null");
- }
- this._name = value;
- }
-
- /**
- * @return Returns the switchType.
- */
- public String getSwitchType() {
- return _switchType;
- }
-
- /**
- * @param switchType The switchType to set.
- */
- public void setSwitchType(String switchType) {
- _switchType = switchType;
- }
-
- /**
- * @return Returns the title.
- */
- public String getTitle() {
- return _title;
- }
-
- /**
- * @param newvalue The title to set.
- */
- public void setTitle(String newvalue) {
- this._title = newvalue;
- }
-}
Modified: trunk/richfaces/tabPanel/src/main/java/org/richfaces/renderkit/TabHeaderRendererBase.java
===================================================================
--- trunk/richfaces/tabPanel/src/main/java/org/richfaces/renderkit/TabHeaderRendererBase.java 2007-05-03 01:43:26 UTC (rev 618)
+++ trunk/richfaces/tabPanel/src/main/java/org/richfaces/renderkit/TabHeaderRendererBase.java 2007-05-03 02:34:26 UTC (rev 619)
@@ -129,22 +129,6 @@
writer.writeAttribute(HTML.class_ATTRIBUTE, labelClass, null);
}
- /**
- * Hook method for create AJAX command script, in non-ajax state -simple write script attributes
- *
- * @param writer
- * @param context
- * @param component
- * @throws IOException
- */
- protected void writeTabElementScript(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException {
- getUtils().encodeAttribute(context, component, HTML.onclick_ATTRIBUTE);
- getUtils().encodeAttribute(context, component, HTML.ondblclick_ATTRIBUTE);
- getUtils().encodeAttribute(context, component, HTML.onkeydown_ATTRIBUTE);
- getUtils().encodeAttribute(context, component, HTML.onkeyup_ATTRIBUTE);
- getUtils().encodeAttribute(context, component, HTML.onkeypress_ATTRIBUTE);
- }
-
public void writeLabel(FacesContext context, UITab tab) throws IOException {
ResponseWriter writer = context.getResponseWriter();
Deleted: trunk/richfaces/tabPanel/src/test/java/org/richfaces/model/TabTest.java
===================================================================
--- trunk/richfaces/tabPanel/src/test/java/org/richfaces/model/TabTest.java 2007-05-03 01:43:26 UTC (rev 618)
+++ trunk/richfaces/tabPanel/src/test/java/org/richfaces/model/TabTest.java 2007-05-03 02:34:26 UTC (rev 619)
@@ -1,115 +0,0 @@
-/**
- * License Agreement.
- *
- * JBoss RichFaces 3.0 - Ajax4jsf Component Library
- *
- * Copyright (C) 2007 Exadel, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-package org.richfaces.model;
-
-import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
-
-/**
- * Unit test for Tab.
- */
-public class TabTest extends AbstractAjax4JsfTestCase {
-
- private Tab tab;
-
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public TabTest(String testName) {
- super(testName);
- }
-
- /* (non-Javadoc)
- * @see org.ajax4jsf.tests.AbstractAjax4JsfTestCase#setUp()
- */
- public void setUp() throws Exception {
- super.setUp();
- }
-
- /* (non-Javadoc)
- * @see org.ajax4jsf.tests.AbstractAjax4JsfTestCase#tearDown()
- */
- public void tearDown() throws Exception {
- super.tearDown();
- tab = null;
- }
-
- public void testTab1() throws Exception {
- tab = new Tab();
-
- assertNull(tab.getName());
- try {
- tab.setName(null);
- assertTrue(false);
- } catch(Exception ex) {
- }
- tab.setName("name");
- assertEquals("name", tab.getName());
-
- tab.setLabel("label");
- assertEquals("label", tab.getLabel());
-
- tab.setDisabled(true);
- assertTrue(tab.isDisabled());
-
- tab.setLabelWidth("labelWidth");
- assertEquals("labelWidth", tab.getLabelWidth());
-
- tab.setSwitchType("switchType");
- assertEquals("switchType", tab.getSwitchType());
-
- tab.setTitle("title");
- assertEquals("title", tab.getTitle());
- }
-
- public void testTab2() throws Exception {
- tab = new Tab("name");
- assertEquals("name", tab.getName());
- assertEquals("name", tab.getLabel());
- assertFalse(tab.isDisabled());
- assertNull(tab.getLabelWidth());
- assertNull(tab.getSwitchType());
- assertNull(tab.getTitle());
-
- try {
- tab = new Tab(null);
- assertTrue(false);
- } catch(NullPointerException ex) {
- }
- }
-
- public void testTab3() throws Exception {
- tab = new Tab("name", "label", true, "labelWidth", "title");
- assertEquals("name", tab.getName());
- assertEquals("label", tab.getLabel());
- assertTrue(tab.isDisabled());
- assertEquals("labelWidth", tab.getLabelWidth());
- assertEquals("title", tab.getTitle());
- assertNull(tab.getSwitchType());
- }
-
- public void testTab4() throws Exception {
- tab = new Tab();
- assertTrue(tab instanceof TabModel);
- }
-}
16 years, 12 months
- 1
- 0
JBoss Rich Faces SVN: r618 - in trunk/richfaces: dropdown-menu/src/main/resources/org/richfaces/renderkit/html/scripts and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-05-02 21:43:26 -0400 (Wed, 02 May 2007)
New Revision: 618
Modified:
trunk/richfaces/dropdown-menu/src/main/resources/org/richfaces/renderkit/html/css/dropdownmenu.xcss
trunk/richfaces/dropdown-menu/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js
trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMenuGroup.jspx
trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx
Log:
Modified: trunk/richfaces/dropdown-menu/src/main/resources/org/richfaces/renderkit/html/css/dropdownmenu.xcss
===================================================================
--- trunk/richfaces/dropdown-menu/src/main/resources/org/richfaces/renderkit/html/css/dropdownmenu.xcss 2007-05-03 00:12:34 UTC (rev 617)
+++ trunk/richfaces/dropdown-menu/src/main/resources/org/richfaces/renderkit/html/css/dropdownmenu.xcss 2007-05-03 01:43:26 UTC (rev 618)
@@ -42,6 +42,7 @@
font-size : 0px;
border: 0px;
margin : 0px;
+ position: relative;
}
.underneath_iframe{
Modified: trunk/richfaces/dropdown-menu/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js
===================================================================
--- trunk/richfaces/dropdown-menu/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js 2007-05-03 00:12:34 UTC (rev 617)
+++ trunk/richfaces/dropdown-menu/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js 2007-05-03 01:43:26 UTC (rev 618)
@@ -585,8 +585,8 @@
if (layerTop + layerdim.height + labelOffset[1] >= windowHeight) {
var invisibleBottom = layerTop + layerdim.height + labelOffset[1] - windowHeight;
var items = this.layer.firstChild.childNodes;
- if (items.length > 0) {
- var lastItem = items[items.length-1];
+ if (items.length > 1) {
+ var lastItem = items[items.length-2];
// var layerOffset = Position.cumulativeOffset(this.layer);
var itemOffset = Position.positionedOffset(lastItem);
// layerTop = top -(itemOffset[1]-layerOffset[1]);
Modified: trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMenuGroup.jspx
===================================================================
--- trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMenuGroup.jspx 2007-05-03 00:12:34 UTC (rev 617)
+++ trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMenuGroup.jspx 2007-05-03 01:43:26 UTC (rev 618)
@@ -50,7 +50,7 @@
<jsp:scriptlet><![CDATA[}]]></jsp:scriptlet>
</span>
- <a id="ref#{clientId}:anchor" class="rich-menu-item-label" href="#">#{component.attributes['value']}</a>
+ <span id="ref#{clientId}:anchor" class="rich-menu-item-label">#{component.attributes['value']}</span>
<div id="ref#{clientId}:folder" class="dr-menu-node rich-menu-item-folder"/>
</div>
Modified: trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx
===================================================================
--- trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx 2007-05-03 00:12:34 UTC (rev 617)
+++ trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx 2007-05-03 01:43:26 UTC (rev 618)
@@ -92,12 +92,11 @@
} else {
]]></jsp:scriptlet>
- <a id="#{clientId}:anchor"
- href="#"
+ <span id="#{clientId}:anchor"
class="rich-menu-item-label">
#{component.attributes['value']}
<f:call name="renderChildren" />
- </a>
+ </span>
<jsp:scriptlet><![CDATA[
}
16 years, 12 months
- 1
- 0
JBoss Rich Faces SVN: r617 - in trunk/richfaces/dropdown-menu/src/main: templates/org/richfaces and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-05-02 20:12:34 -0400 (Wed, 02 May 2007)
New Revision: 617
Modified:
trunk/richfaces/dropdown-menu/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js
trunk/richfaces/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx
Log:
Back to original markup
Modified: trunk/richfaces/dropdown-menu/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js
===================================================================
--- trunk/richfaces/dropdown-menu/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js 2007-05-02 22:16:54 UTC (rev 616)
+++ trunk/richfaces/dropdown-menu/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js 2007-05-03 00:12:34 UTC (rev 617)
@@ -664,7 +664,7 @@
Exadel.Menu.Layers.clearLMTO();
var menuNode = this.layer.parentNode;
- $(menuNode.id + 'Label').className='dr-menu-label dr-menu-label-select rich-ddmenu-label rich-ddmenu-label-select';
+ menuNode.className='dr-menu-label dr-menu-label-select rich-ddmenu-label rich-ddmenu-label-select';
Event.stop(e);
}.bindAsEventListener(this);
@@ -676,7 +676,7 @@
Exadel.Menu.Layers.setLMTO(this.hideDelay);
}
var menuNode = this.layer.parentNode;
- $(menuNode.id + 'Label').className='dr-menu-label dr-menu-label-unselect rich-ddmenu-label rich-ddmenu-label-unselect';
+ menuNode.className='dr-menu-label dr-menu-label-unselect rich-ddmenu-label rich-ddmenu-label-unselect';
Event.stop(e);
}.bindAsEventListener(this);
Modified: trunk/richfaces/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx
===================================================================
--- trunk/richfaces/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx 2007-05-02 22:16:54 UTC (rev 616)
+++ trunk/richfaces/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx 2007-05-03 00:12:34 UTC (rev 617)
@@ -21,28 +21,26 @@
<jsp:scriptlet>
<![CDATA[org.richfaces.component.util.FormUtil.throwEnclFormReqExceptionIfNeed(context,component);]]>
</jsp:scriptlet>
- <div id="#{clientId}" class="#{component.attributes['styleClass']}"
- style="position: relative; #{component.attributes['style']};"
- onmouseover="$('#{clientId}Label').className='dr-menu-label dr-menu-label-select rich-ddmenu-label rich-ddmenu-label-select' ; #{component.attributes['onmouseover']}"
- onmouseout="$('#{clientId}Label').className='dr-menu-label dr-menu-label-unselect rich-ddmenu-label rich-ddmenu-label-unselect'; #{component.attributes['onmouseout']}"
+ <div id="#{clientId}"
+ style="#{component.attributes['style']};"
+ class="#{component.attributes['styleClass']} dr-menu-label dr-menu-label-unselect rich-ddmenu-label rich-ddmenu-label-unselect"
+ onmouseover="this.className='dr-menu-label dr-menu-label-select rich-ddmenu-label rich-ddmenu-label-select' ; #{component.attributes['onmouseover']}"
+ onmouseout="this.className='dr-menu-label dr-menu-label-unselect rich-ddmenu-label rich-ddmenu-label-unselect'; #{component.attributes['onmouseout']}"
onmousemove="#{component.attributes['onmousemove']}">
- <div id="#{clientId}Label" class="dr-menu-label dr-menu-label-unselect rich-ddmenu-label rich-ddmenu-label-unselect"
- >
- <jsp:scriptlet>
- <![CDATA[if(component.getFacet("label")!=null && component.getFacet("label").isRendered()) {]]>
- </jsp:scriptlet>
- <span class="dr-label-text-decor rich-label-text-decor">
- <u:insertFacet name="label" />
- </span>
- <jsp:scriptlet>
- <![CDATA[} else {]]>
- </jsp:scriptlet>
- <span class="dr-label-text-decor rich-label-text-decor">#{component.attributes['value']}</span>
- <jsp:scriptlet>
- <![CDATA[}]]>
- </jsp:scriptlet>
- </div>
+ <jsp:scriptlet>
+ <![CDATA[if(component.getFacet("label")!=null && component.getFacet("label").isRendered()) {]]>
+ </jsp:scriptlet>
+ <span class="dr-label-text-decor rich-label-text-decor">
+ <u:insertFacet name="label" />
+ </span>
+ <jsp:scriptlet>
+ <![CDATA[} else {]]>
+ </jsp:scriptlet>
+ <span class="dr-label-text-decor rich-label-text-decor">#{component.attributes['value']}</span>
+ <jsp:scriptlet>
+ <![CDATA[}]]>
+ </jsp:scriptlet>
<vcp:body>
<f:call name="renderChildren" />
16 years, 12 months
- 1
- 0
JBoss Rich Faces SVN: r616 - trunk/richfaces/dropdown-menu/src/main/java/org/richfaces/renderkit/html.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-05-02 18:16:54 -0400 (Wed, 02 May 2007)
New Revision: 616
Modified:
trunk/richfaces/dropdown-menu/src/main/java/org/richfaces/renderkit/html/DropDownMenuRendererBase.java
Log:
http://jira.jboss.com/jira/browse/RF-144 fixed
Modified: trunk/richfaces/dropdown-menu/src/main/java/org/richfaces/renderkit/html/DropDownMenuRendererBase.java
===================================================================
--- trunk/richfaces/dropdown-menu/src/main/java/org/richfaces/renderkit/html/DropDownMenuRendererBase.java 2007-05-02 21:20:54 UTC (rev 615)
+++ trunk/richfaces/dropdown-menu/src/main/java/org/richfaces/renderkit/html/DropDownMenuRendererBase.java 2007-05-02 22:16:54 UTC (rev 616)
@@ -28,20 +28,21 @@
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
+import java.util.Set;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
-import org.ajax4jsf.framework.renderer.AjaxRendererUtils;
+import org.ajax4jsf.framework.ajax.AjaxContext;
import org.ajax4jsf.framework.renderer.HeaderResourcesRendererBase;
+import org.ajax4jsf.framework.util.javascript.JSFunction;
import org.richfaces.component.UIDropDownMenu;
import org.richfaces.component.UIMenuGroup;
import org.richfaces.component.UIMenuItem;
import org.richfaces.component.UIMenuSeparator;
import org.richfaces.component.util.HtmlUtil;
import org.richfaces.renderkit.ScriptOptions;
-import org.ajax4jsf.framework.util.javascript.JSFunction;
public class DropDownMenuRendererBase extends HeaderResourcesRendererBase {
@@ -108,8 +109,11 @@
writer.writeAttribute("type", "text/javascript", null);
encodeScript(context, layer);
writer.endElement("script");
- AjaxRendererUtils.addRegionByName(context, layer, clientId + "_menu_iframe");
- AjaxRendererUtils.addRegionByName(context, layer, clientId + "_menu_script");
+
+ AjaxContext ajaxContext = AjaxContext.getCurrentInstance();
+ Set renderedAreas = ajaxContext.getAjaxRenderedAreas();
+ renderedAreas.add(clientId + "_menu_iframe");
+ renderedAreas.add(clientId + "_menu_script");
}
public void encodeItems(FacesContext context, UIComponent component) throws IOException {
16 years, 12 months
- 1
- 0
JBoss Rich Faces SVN: r615 - in trunk/richfaces: dropdown-menu/src/main/resources/org/richfaces/renderkit/html/css and 4 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-05-02 17:20:54 -0400 (Wed, 02 May 2007)
New Revision: 615
Modified:
trunk/richfaces/dropdown-menu/src/main/java/org/richfaces/renderkit/html/DropDownMenuRendererBase.java
trunk/richfaces/dropdown-menu/src/main/resources/org/richfaces/renderkit/html/css/dropdownmenu.xcss
trunk/richfaces/dropdown-menu/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js
trunk/richfaces/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx
trunk/richfaces/menu-components/src/main/java/org/richfaces/renderkit/html/images/MenuNodeImage.java
trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/css/menucomponents.xcss
Log:
RF-137, 138 fixed
Modified: trunk/richfaces/dropdown-menu/src/main/java/org/richfaces/renderkit/html/DropDownMenuRendererBase.java
===================================================================
--- trunk/richfaces/dropdown-menu/src/main/java/org/richfaces/renderkit/html/DropDownMenuRendererBase.java 2007-05-02 15:51:14 UTC (rev 614)
+++ trunk/richfaces/dropdown-menu/src/main/java/org/richfaces/renderkit/html/DropDownMenuRendererBase.java 2007-05-02 21:20:54 UTC (rev 615)
@@ -39,6 +39,7 @@
import org.richfaces.component.UIMenuGroup;
import org.richfaces.component.UIMenuItem;
import org.richfaces.component.UIMenuSeparator;
+import org.richfaces.component.util.HtmlUtil;
import org.richfaces.renderkit.ScriptOptions;
import org.ajax4jsf.framework.util.javascript.JSFunction;
@@ -73,12 +74,28 @@
writer.startElement("div", layer);
writer.writeAttribute("id", clientId+"_menu", null);
writer.writeAttribute("class", "dr-menu-list-border rich-menu-list-border", null);
- writer.writeAttribute("style", "visibility: hidden; z-index:100; " + (width!=null&&width.length()>0?"width: "+width:""), null);
+ writer.writeAttribute("style", "visibility: hidden; z-index:100; ", null);
writer.startElement("div", layer);
writer.writeAttribute("class", "dr-menu-list-bg rich-menu-list-bg", null);
encodeItems(context, layer);
+
+ writer.startElement("div", layer);
+ writer.writeAttribute("class", "dr-menu-list-strut rich-menu-list-strut", null);
+
+ writer.startElement("img", layer);
+ writer.writeAttribute("width", "1", null);
+ writer.writeAttribute("height", "1", null);
+ writer.writeAttribute("alt", "", null);
+ writer.writeAttribute("border", "0", null);
+ writer.writeAttribute("style", width!=null && width.length() > 0 ? "width: " + HtmlUtil.qualifySize(width) : "", null);
+ writer.writeAttribute("src",
+ getResource("/org/richfaces/renderkit/html/images/spacer.gif").getUri(context, null),
+ null);
+ writer.endElement("img");
writer.endElement("div");
+
writer.endElement("div");
+ writer.endElement("div");
writer.startElement("iframe", layer);
writer.writeAttribute("id", clientId+"_menu_iframe", null);
@@ -120,8 +137,6 @@
}
public void encodeScript(FacesContext context, UIComponent component) throws IOException {
-
-
StringBuffer buffer = new StringBuffer();
JSFunction function = new JSFunction("new Exadel.Menu.Layer");
function.addParameter(component.getClientId(context)+"_menu");
Modified: trunk/richfaces/dropdown-menu/src/main/resources/org/richfaces/renderkit/html/css/dropdownmenu.xcss
===================================================================
--- trunk/richfaces/dropdown-menu/src/main/resources/org/richfaces/renderkit/html/css/dropdownmenu.xcss 2007-05-02 15:51:14 UTC (rev 614)
+++ trunk/richfaces/dropdown-menu/src/main/resources/org/richfaces/renderkit/html/css/dropdownmenu.xcss 2007-05-02 21:20:54 UTC (rev 615)
@@ -37,6 +37,13 @@
.dr-label-text-decor {
font-weight : bold;
}
+
+.dr-menu-list-strut {
+ font-size : 0px;
+ border: 0px;
+ margin : 0px;
+}
+
.underneath_iframe{
position: absolute;
z-index: 90;
@@ -72,8 +79,8 @@
<u:selector name=".dr-menu-label-select">
<u:style name="border-color" skin="panelBorderColor" />
- <u:style name="background-color" skin="headerBackgroundColor" />
- <u:style name="color" skin="headerTextColor" />
+ <u:style name="background-color" skin="controlBackgroundColor" />
+ <u:style name="color" skin="generalTextColor" />
</u:selector>
</f:template>
Modified: trunk/richfaces/dropdown-menu/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js
===================================================================
--- trunk/richfaces/dropdown-menu/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js 2007-05-02 15:51:14 UTC (rev 614)
+++ trunk/richfaces/dropdown-menu/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js 2007-05-02 21:20:54 UTC (rev 615)
@@ -224,7 +224,8 @@
},
showMenuLayer: function (layerId, e, delay){
this.clearPopUpTO();
- this.showTimeOutFlag = setTimeout(new Exadel.Menu.DelayedPopUp(layerId, e).show, delay);
+ this.showTimeOutFlag = setTimeout(new Exadel.Menu.DelayedPopUp(layerId, e, function(){this.layerId = null;}.bind(this)).show, delay);
+ this.layerId = layerId;
},
showDropDownLayer: function (layerId, parentId, e, delay){
this.clearPopUpTO();
@@ -661,6 +662,10 @@
function(e){
Exadel.Menu.MouseIn=true;
Exadel.Menu.Layers.clearLMTO();
+
+ var menuNode = this.layer.parentNode;
+ $(menuNode.id + 'Label').className='dr-menu-label dr-menu-label-select rich-ddmenu-label rich-ddmenu-label-select';
+
Event.stop(e);
}.bindAsEventListener(this);
@@ -670,6 +675,9 @@
if (!Exadel.Menu.selectOpen) {
Exadel.Menu.Layers.setLMTO(this.hideDelay);
}
+ var menuNode = this.layer.parentNode;
+ $(menuNode.id + 'Label').className='dr-menu-label dr-menu-label-unselect rich-ddmenu-label rich-ddmenu-label-unselect';
+
Event.stop(e);
}.bindAsEventListener(this);
@@ -806,7 +814,6 @@
Exadel.Menu.Layers.showMenuLayer(this.id, e, this.delay);
Exadel.Menu.Layers.levels[this.level] = this;
// if (this.eventOnOpen) this.eventOnOpen();
-
},
closeSiblings: function(e){
//LOG.a4j_debug('closeASiblins ' + this.id +' ' +this.level);
Modified: trunk/richfaces/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx
===================================================================
--- trunk/richfaces/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx 2007-05-02 15:51:14 UTC (rev 614)
+++ trunk/richfaces/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx 2007-05-02 21:20:54 UTC (rev 615)
@@ -21,25 +21,29 @@
<jsp:scriptlet>
<![CDATA[org.richfaces.component.util.FormUtil.throwEnclFormReqExceptionIfNeed(context,component);]]>
</jsp:scriptlet>
- <div id="#{clientId}" class="dr-menu-label dr-menu-label-unselect rich-ddmenu-label rich-ddmenu-label-unselect #{component.attributes['styleClass']}"
- style="#{component.attributes['style']};"
- onmouseover="this.className='dr-menu-label dr-menu-label-select rich-ddmenu-label rich-ddmenu-label-select' ; #{component.attributes['onmouseover']}"
- onmouseout="this.className='dr-menu-label dr-menu-label-unselect rich-ddmenu-label rich-ddmenu-label-unselect'; #{component.attributes['onmouseout']}"
+ <div id="#{clientId}" class="#{component.attributes['styleClass']}"
+ style="position: relative; #{component.attributes['style']};"
+ onmouseover="$('#{clientId}Label').className='dr-menu-label dr-menu-label-select rich-ddmenu-label rich-ddmenu-label-select' ; #{component.attributes['onmouseover']}"
+ onmouseout="$('#{clientId}Label').className='dr-menu-label dr-menu-label-unselect rich-ddmenu-label rich-ddmenu-label-unselect'; #{component.attributes['onmouseout']}"
onmousemove="#{component.attributes['onmousemove']}">
- <jsp:scriptlet>
- <![CDATA[if(component.getFacet("label")!=null && component.getFacet("label").isRendered()) {]]>
- </jsp:scriptlet>
- <span class="dr-label-text-decor rich-label-text-decor">
- <u:insertFacet name="label" />
- </span>
- <jsp:scriptlet>
- <![CDATA[} else {]]>
- </jsp:scriptlet>
- <span class="dr-label-text-decor rich-label-text-decor">#{component.attributes['value']}</span>
- <jsp:scriptlet>
- <![CDATA[}]]>
- </jsp:scriptlet>
+ <div id="#{clientId}Label" class="dr-menu-label dr-menu-label-unselect rich-ddmenu-label rich-ddmenu-label-unselect"
+ >
+ <jsp:scriptlet>
+ <![CDATA[if(component.getFacet("label")!=null && component.getFacet("label").isRendered()) {]]>
+ </jsp:scriptlet>
+ <span class="dr-label-text-decor rich-label-text-decor">
+ <u:insertFacet name="label" />
+ </span>
+ <jsp:scriptlet>
+ <![CDATA[} else {]]>
+ </jsp:scriptlet>
+ <span class="dr-label-text-decor rich-label-text-decor">#{component.attributes['value']}</span>
+ <jsp:scriptlet>
+ <![CDATA[}]]>
+ </jsp:scriptlet>
+ </div>
+
<vcp:body>
<f:call name="renderChildren" />
</vcp:body>
Modified: trunk/richfaces/menu-components/src/main/java/org/richfaces/renderkit/html/images/MenuNodeImage.java
===================================================================
--- trunk/richfaces/menu-components/src/main/java/org/richfaces/renderkit/html/images/MenuNodeImage.java 2007-05-02 15:51:14 UTC (rev 614)
+++ trunk/richfaces/menu-components/src/main/java/org/richfaces/renderkit/html/images/MenuNodeImage.java 2007-05-02 21:20:54 UTC (rev 615)
@@ -41,7 +41,7 @@
String tmp;
int intValue;
- tmp = (String) skin.getParameter(context,"headerBackgroundColor");
+ tmp = (String) skin.getParameter(context,"generalTextColor");
if (tmp == null) tmp = "#4A75B5";
intValue = HtmlColor.decode(tmp).getRGB();
mnd.setGeneralColor(new Integer(intValue));
Modified: trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/css/menucomponents.xcss
===================================================================
--- trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/css/menucomponents.xcss 2007-05-02 15:51:14 UTC (rev 614)
+++ trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/css/menucomponents.xcss 2007-05-02 21:20:54 UTC (rev 615)
@@ -68,13 +68,10 @@
</u:selector>
<u:selector name=".dr-menu-item-hover">
- <u:style name="background-image">
- <f:resource f:key="org.richfaces.renderkit.html.images.background.MenuItemBackground"/>
- </u:style>
<u:style name="background-position" value="top left"/>
<u:style name="background-repeat" value="repeat-x"/>
- <u:style name="border-color" skin="headerBackgroundColor" />
- <u:style name="background-color" skin="tabBackgroundColor" />
+ <u:style name="border-color" skin="tipBorderColor" />
+ <u:style name="background-color" skin="tipBackgroundColor" />
</u:selector>
<u:selector name=".dr-menu-node">
16 years, 12 months
- 1
- 0