9:51 a.m.
Author: abelevich
Date: 2011-02-08 10:51:13 -0500 (Tue, 08 Feb 2011)
New Revision: 21540
Modified:
trunk/examples/input-demo/pom.xml
trunk/examples/output-demo/src/main/webapp/examples/dropDownMenu.xhtml
trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractMenuGroup.java
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menu-base.js
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menu.js
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menugroup.js
Log:
RF-10216 Menu group: horizontalOffset and verticalOffset don't work
Modified: trunk/examples/input-demo/pom.xml
===================================================================
--- trunk/examples/input-demo/pom.xml 2011-02-08 15:12:45 UTC (rev 21539)
+++ trunk/examples/input-demo/pom.xml 2011-02-08 15:51:13 UTC (rev 21540)
@@ -117,6 +117,11 @@
</dependency>
<dependency>
+ <groupId>org.richfaces.ui.misc</groupId>
+ <artifactId>richfaces-ui-misc-ui</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<scope>provided</scope>
Modified: trunk/examples/output-demo/src/main/webapp/examples/dropDownMenu.xhtml
===================================================================
--- trunk/examples/output-demo/src/main/webapp/examples/dropDownMenu.xhtml 2011-02-08
15:12:45 UTC (rev 21539)
+++ trunk/examples/output-demo/src/main/webapp/examples/dropDownMenu.xhtml 2011-02-08
15:51:13 UTC (rev 21540)
@@ -31,12 +31,22 @@
<body>
<ui:composition template="/templates/template.xhtml">
+ <style>
+ .optionList {
+ height:22px;
+ }
+ .vertical-menu-cell {
+ padding:0px 4px 0px 4px;
+ }
+ </style>
+
<ui:define name="title">DROPDOWN MENU Development
demo</ui:define>
<ui:define name="body_head">DROPDOWN MENU Development
demo</ui:define>
<ui:define name="body">
+
<h:form id="form">
<h:panelGrid id="panel" columns="2">
<h:panelGroup layout="block" style="width:300px;">
@@ -48,20 +58,19 @@
<br />
<ddm:dropDownMenu hideDelay="600" showEvent="click"
jointPoint="bottomLeft" direction="autoRight"
- id="ddmenu" disabled="#{menuBean.disabled}"
- mode="#{menuBean.mode}">
+ id="ddmenu" disabled="#{menuBean.disabled}"
mode="#{menuBean.mode}">
<f:facet name="label">
<h:panelGroup>
<h:graphicImage value="/images/ddmenu/copy.gif"
styleClass="pic"/>
<h:outputText value="File"/>
</h:panelGroup>
</f:facet>
- <f:facet name="labelDisabled">
+ <f:facet name="labelDisabled">
<h:panelGroup>
<h:graphicImage value="/images/ddmenu/copy.gif"
styleClass="pic"/>
<h:outputText value="(disabled)File"/>
</h:panelGroup>
- </f:facet>
+ </f:facet>
<ddm:menuItem id="menuNew1" label="New"
icon="/images/ddmenu/create_doc.gif"
action="#{menuBean.doNew}" execute="@form">
<f:facet name="icon">
@@ -85,11 +94,11 @@
<f:setPropertyActionListener
target="#{menuBean.value}" value="Save All" />
</ddm:menuItem>
</ddm:menuGroup>
- <ddm:menuGroup label="Save As...">
+ <ddm:menuGroup label="Save As..."
horizontalOffset="10" jointPoint="topRight"
direction="bottomRight">
<ddm:menuItem label="Save"
icon="/images/ddmenu/save.gif" >
<f:setPropertyActionListener
target="#{menuBean.value}" value="Save" />
</ddm:menuItem>
- <ddm:menuGroup label="Save All"
icon="/images/ddmenu/save_all.gif" >
+ <ddm:menuGroup label="Save All"
icon="/images/ddmenu/save_all.gif" direction="bottomRight"
jointPoint="topRight" verticalOffset="10">
<ddm:menuItem label="Save All 1"
icon="/images/ddmenu/save_all.gif">
<f:setPropertyActionListener
target="#{menuBean.value}" value="Save All 1" />
</ddm:menuItem>
@@ -157,76 +166,81 @@
<br/>
<h:form id="form2">
<h:panelGroup>
- <ddm:dropDownMenu id="ddmenu2">
- <f:facet name="label">
- <h:panelGroup>
- <h:graphicImage value="/images/ddmenu/copy.gif"
styleClass="pic"/>
- <h:outputText value="File"/>
- </h:panelGroup>
- </f:facet>
- <f:facet name="labelDisabled">
- <h:panelGroup>
- <h:graphicImage value="/images/ddmenu/copy.gif"
styleClass="pic"/>
- <h:outputText value="(disabled)File"/>
- </h:panelGroup>
- </f:facet>
- <ddm:menuItem id="menuNew2" label="New"
icon="/images/ddmenu/create_doc.gif"
- action="#{menuBean.doNew}" execute="@form">
- <f:facet name="icon">
- <h:selectBooleanCheckbox id="checkbox"
value="#{menuBean.checkbox}"/>
- </f:facet>
- </ddm:menuItem>
- <ddm:menuItem label="Open"
action="#{menuBean.doOpen}">
- <f:facet name="icon">
- <h:graphicImage value="/images/ddmenu/open.gif"
/>
- </f:facet>
- </ddm:menuItem>
- </ddm:dropDownMenu>
- <ddm:dropDownMenu id="ddmenu3">
- <f:facet name="label">
- <h:panelGroup>
- <h:graphicImage value="/images/ddmenu/copy.gif"
styleClass="pic"/>
- <h:outputText value="File"/>
- </h:panelGroup>
- </f:facet>
- <f:facet name="labelDisabled">
- <h:panelGroup>
- <h:graphicImage value="/images/ddmenu/copy.gif"
styleClass="pic"/>
- <h:outputText value="(disabled)File"/>
- </h:panelGroup>
- </f:facet>
- <ddm:menuItem id="menuNew3" label="New"
icon="/images/ddmenu/create_doc.gif"
- action="#{menuBean.doNew}" execute="@form">
-
- </ddm:menuItem>
- <ddm:menuItem label="Open"
action="#{menuBean.doOpen}">
- <f:facet name="icon">
- <h:graphicImage value="/images/ddmenu/open.gif"
/>
- </f:facet>
- </ddm:menuItem>
- </ddm:dropDownMenu>
- <ddm:dropDownMenu id="ddmenu4">
- <f:facet name="label">
- <h:panelGroup>
- <h:graphicImage value="/images/ddmenu/copy.gif"
styleClass="pic"/>
- <h:outputText value="File"/>
- </h:panelGroup>
- </f:facet>
- <f:facet name="labelDisabled">
- <h:panelGroup>
- <h:graphicImage value="/images/ddmenu/copy.gif"
styleClass="pic"/>
- <h:outputText value="(disabled)File"/>
- </h:panelGroup>
- </f:facet>
- <ddm:menuItem id="menuNew" label="New"
icon="/images/ddmenu/create_doc.gif"
- action="#{menuBean.doNew}" execute="@form">
- </ddm:menuItem>
- <ddm:menuItem label="Open"
action="#{menuBean.doOpen}">
- <f:facet name="icon">
- <h:graphicImage value="/images/ddmenu/open.gif"
/>
- </f:facet>
- </ddm:menuItem>
- </ddm:dropDownMenu>
+ <h:panelGrid styleClass="vertical-menu-cell"
columnClasses="optionList" columns="1" cellspacing="0"
cellpadding="0">
+ <ddm:dropDownMenu id="ddmenu2"
horizontalOffset="10" verticalOffset="20"
jointPoint="topRight" direction="bottomRight" style="border:1px
solid #{a4jSkin.panelBorderColor}">
+ <f:facet name="label">
+ <h:panelGroup>
+ <h:graphicImage
value="/images/ddmenu/copy.gif" styleClass="pic"/>
+ <h:outputText value="File"/>
+ </h:panelGroup>
+ </f:facet>
+ <f:facet name="labelDisabled">
+ <h:panelGroup>
+ <h:graphicImage
value="/images/ddmenu/copy.gif" styleClass="pic"/>
+ <h:outputText
value="(disabled)File"/>
+ </h:panelGroup>
+ </f:facet>
+ <ddm:menuItem id="menuNew2" label="New"
icon="/images/ddmenu/create_doc.gif"
+ action="#{menuBean.doNew}"
execute="@form">
+ <f:facet name="icon">
+ <h:selectBooleanCheckbox id="checkbox"
value="#{menuBean.checkbox}"/>
+ </f:facet>
+ </ddm:menuItem>
+ <ddm:menuItem label="Open"
action="#{menuBean.doOpen}">
+ <f:facet name="icon">
+ <h:graphicImage
value="/images/ddmenu/open.gif" />
+ </f:facet>
+ </ddm:menuItem>
+ </ddm:dropDownMenu>
+ <ddm:dropDownMenu id="ddmenu3">
+ <f:facet name="label">
+ <h:panelGroup>
+ <h:graphicImage
value="/images/ddmenu/copy.gif" styleClass="pic"/>
+ <h:outputText value="File"/>
+ </h:panelGroup>
+ </f:facet>
+ <f:facet name="labelDisabled">
+ <h:panelGroup>
+ <h:graphicImage
value="/images/ddmenu/copy.gif" styleClass="pic"/>
+ <h:outputText
value="(disabled)File"/>
+ </h:panelGroup>
+ </f:facet>
+ <ddm:menuItem id="menuNew3" label="New"
icon="/images/ddmenu/create_doc.gif"
+ action="#{menuBean.doNew}"
execute="@form">
+
+ </ddm:menuItem>
+ <ddm:menuItem label="Open"
action="#{menuBean.doOpen}">
+ <f:facet name="icon">
+ <h:graphicImage
value="/images/ddmenu/open.gif" />
+ </f:facet>
+ </ddm:menuItem>
+ </ddm:dropDownMenu>
+ <ddm:dropDownMenu id="ddmenu4">
+ <f:facet name="label">
+ <h:panelGroup>
+ <h:graphicImage
value="/images/ddmenu/copy.gif" styleClass="pic"/>
+ <h:outputText value="File"/>
+ </h:panelGroup>
+ </f:facet>
+ <f:facet name="labelDisabled">
+ <h:panelGroup>
+ <h:graphicImage
value="/images/ddmenu/copy.gif" styleClass="pic"/>
+ <h:outputText
value="(disabled)File"/>
+ </h:panelGroup>
+ </f:facet>
+ <ddm:menuItem id="menuNew" label="New"
icon="/images/ddmenu/create_doc.gif"
+ action="#{menuBean.doNew}"
execute="@form">
+ </ddm:menuItem>
+ <ddm:menuItem label="Open"
action="#{menuBean.doOpen}">
+ <f:facet name="icon">
+ <h:graphicImage
value="/images/ddmenu/open.gif" />
+ </f:facet>
+ </ddm:menuItem>
+ </ddm:dropDownMenu>
+
+
+ </h:panelGrid>
+
<br/>
<br/>
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractMenuGroup.java
===================================================================
---
trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractMenuGroup.java 2011-02-08
15:12:45 UTC (rev 21539)
+++
trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractMenuGroup.java 2011-02-08
15:51:13 UTC (rev 21540)
@@ -43,10 +43,10 @@
public abstract Positioning getJointPoint();
@Attribute
- public abstract String getVerticalOffset();
+ public abstract int getVerticalOffset();
@Attribute
- public abstract String getHorizontalOffset();
+ public abstract int getHorizontalOffset();
@Attribute(hidden = true)
public abstract Object getValue();
Modified:
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menu-base.js
===================================================================
---
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menu-base.js 2011-02-08
15:12:45 UTC (rev 21539)
+++
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menu-base.js 2011-02-08
15:51:13 UTC (rev 21540)
@@ -8,7 +8,7 @@
showDelay : 50,
hideDelay : 300,
verticalOffset : 0,
- horisantalOffset : 0,
+ horizontalOffset : 0,
showEvent : 'mouseover',
positionOffset : [0, 0],
itemCss : "rf-ddm-itm",
@@ -36,7 +36,7 @@
this.options.attachTo = this.id;
this.options.attachToBody = false;
- this.options.positionOffset = [this.options.horisantalOffset,
+ this.options.positionOffset = [this.options.horizontalOffset,
this.options.verticalOffset];
this.popup = new RichFaces.ui.Popup(this.id + "_list", {
attachTo : this.id,
@@ -121,7 +121,7 @@
this.displayed = false;
this.__deselectCurrentItem();
this.currentSelectedItemIndex = -1;
- parentMenu = rf.$(this.__getParentMenu());
+ var parentMenu = rf.$(this.__getParentMenu());
if (this.id != parentMenu.id) {
parentMenu.popupElement.focus();
rf.ui.MenuManager.setActiveSubMenu(parentMenu);
@@ -211,7 +211,6 @@
},
__leaveHandler : function() {
- //console.log('__leaveHandler showTimeoutId:'+ this.showTimeoutId);
this.hideTimeoutId = window.setTimeout($.proxy(function() {
this.hide();
}, this), this.options.hideDelay);
@@ -226,7 +225,7 @@
// clean up code here
this.detach(this.id);
- rf.Event.unbind(this.popupElement, "keydown" + this.namespace)
+ rf.Event.unbind(this.popupElement, "keydown" + this.namespace);
// call parent's destroy method
$super.destroy.call(this);
Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menu.js
===================================================================
---
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menu.js 2011-02-08
15:12:45 UTC (rev 21539)
+++
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menu.js 2011-02-08
15:51:13 UTC (rev 21540)
@@ -2,9 +2,9 @@
rf.ui = rf.ui || {};
var defaultOptions = {
- direction : "AA",
- jointPoint : "AA",
- positionType : "DROPDOWN"
+ positionType : "DROPDOWN",
+ direction : "AA",
+ jointPoint : "AA"
};
// constructor definition
@@ -39,15 +39,14 @@
initiateGroups : function(groupOptions) {
for (var i in groupOptions) {
var groupId = groupOptions[i].id;
- var positionOffset = [groupOptions[i].horizontalOffset,
- groupOptions[i].verticalOffset];
if (null != groupId) {
this.groupList[groupId] = new RichFaces.ui.MenuGroup(
groupId, {
rootMenuId : this.id,
onshow : groupOptions[i].onshow,
onhide : groupOptions[i].onhide,
- positionOffset : positionOffset,
+ horizontalOffset: groupOptions[i].horizontalOffset,
+ verticalOffset: groupOptions[i].verticalOffset,
jointPoint : groupOptions[i].jointPoint,
direction : groupOptions[i].direction
});
Modified:
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menugroup.js
===================================================================
---
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menugroup.js 2011-02-08
15:12:45 UTC (rev 21539)
+++
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menugroup.js 2011-02-08
15:51:13 UTC (rev 21540)
@@ -2,6 +2,9 @@
rf.ui = rf.ui || {};
var defaultOptions = {
showEvent : 'mouseenter',
+ direction : "AA",
+ jointPoint : "AA",
+ positionType : "DDMENUGROUP",
showDelay : 300,
itemCss : "rf-ddm-itm"
}