9:32 a.m.
Author: sergeyhalipov
Date: 2007-11-22 10:32:14 -0500 (Thu, 22 Nov 2007)
New Revision: 4188
Modified:
branches/3.1.x/ui/panelmenu/src/main/java/org/richfaces/component/UIPanelMenu.java
branches/3.1.x/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java
branches/3.1.x/ui/panelmenu/src/main/resources/org/richfaces/renderkit/html/scripts/panelMenu.js
branches/3.1.x/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuGroup.jspx
branches/3.1.x/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuItem.jspx
Log:
Panel menu: fixed custom style class for selected element.
Modified:
branches/3.1.x/ui/panelmenu/src/main/java/org/richfaces/component/UIPanelMenu.java
===================================================================
---
branches/3.1.x/ui/panelmenu/src/main/java/org/richfaces/component/UIPanelMenu.java 2007-11-22
15:22:58 UTC (rev 4187)
+++
branches/3.1.x/ui/panelmenu/src/main/java/org/richfaces/component/UIPanelMenu.java 2007-11-22
15:32:14 UTC (rev 4188)
@@ -7,8 +7,8 @@
public static final String COMPONENT_TYPE = "org.richfaces.panelMenu";
public static final String DEFAULT_SELECTED_CLASS = "dr-pmenu-selected-item";
- public static final String USER_DEFINED_SELECTED_CLASS =
"rich-pmenu-item-selected";
-
+ public static final String USER_DEFINED_SELECTED_CLASS =
"rich-pmenu-selected-element";
+
public abstract String getEvent();
public abstract void setEvent(String event);
public abstract String getMode();
@@ -113,4 +113,5 @@
public String getSelectedName(){
return getValue() != null ? getValue().toString() : getSelectedChild();
}
+
}
Modified:
branches/3.1.x/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java
===================================================================
---
branches/3.1.x/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java 2007-11-22
15:22:58 UTC (rev 4187)
+++
branches/3.1.x/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java 2007-11-22
15:32:14 UTC (rev 4188)
@@ -196,6 +196,18 @@
}
return styleBuffer.toString();
}
+
+ public String getSelectedClass(FacesContext context, UIComponent component) {
+ if (isSelected(context, component)) {
+ StringBuffer selectedClass = null;
+ selectedClass= new StringBuffer();
+ selectedClass.append(UIPanelMenu.DEFAULT_SELECTED_CLASS).
+ append(" ").
+ append(UIPanelMenu.USER_DEFINED_SELECTED_CLASS);
+ return selectedClass.toString();
+ }
+ return "";
+ }
public String getLabelClass(FacesContext context, UIComponent component) {
StringBuffer resClass = new StringBuffer();
@@ -208,9 +220,6 @@
resClass.append("rich-pmenu-item-label");
}
}
- if (isSelected(context, component)) {
- resClass.append("
").append(UIPanelMenu.DEFAULT_SELECTED_CLASS).append("
").append(UIPanelMenu.USER_DEFINED_SELECTED_CLASS);
- }
return resClass.toString();
}
Modified:
branches/3.1.x/ui/panelmenu/src/main/resources/org/richfaces/renderkit/html/scripts/panelMenu.js
===================================================================
---
branches/3.1.x/ui/panelmenu/src/main/resources/org/richfaces/renderkit/html/scripts/panelMenu.js 2007-11-22
15:22:58 UTC (rev 4187)
+++
branches/3.1.x/ui/panelmenu/src/main/resources/org/richfaces/renderkit/html/scripts/panelMenu.js 2007-11-22
15:32:14 UTC (rev 4188)
@@ -17,7 +17,7 @@
this.lastExpanded = null;
this.selectedChild = selectedChild;
this.defaultSelectedClass = 'dr-pmenu-selected-item';
- this.userDefinedSelectedClass = 'dr-pmenu-selected-item';
+ this.userDefinedSelectedClass = 'rich-pmenu-selected-element';
this.is = 'panelMenu';
this.selectedNameInput = $(myId + 'selectedItemName');
PanelMenuStorage[myId] = this;
@@ -80,6 +80,7 @@
this.labelArea = $('icon' + ids.myId);
this.content = document.getElementsByClassName("dr-pmenu-group-self-label",
this.obj)[0];
this.iconAlign = iconAlign;
+ this.mainRow = $("row_" + ids.myId);
/*
if (level == 0){
this.tdhider.style.display = "";
@@ -314,12 +315,12 @@
setSelectedClass: function(e){
- this.labelArea.addClassName(this.rootMenu.defaultSelectedClass);
- this.labelArea.addClassName(this.rootMenu.userDefinedSelectedClass);
+ this.mainRow.addClassName(this.rootMenu.defaultSelectedClass);
+ this.mainRow.addClassName(this.rootMenu.userDefinedSelectedClass);
},
removeSelectedClass: function(e){
- this.labelArea.removeClassName(this.rootMenu.defaultSelectedClass);
- this.labelArea.removeClassName(this.rootMenu.userDefinedSelectedClass);
+ this.mainRow.removeClassName(this.rootMenu.defaultSelectedClass);
+ this.mainRow.removeClassName(this.rootMenu.userDefinedSelectedClass);
},
Modified:
branches/3.1.x/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuGroup.jspx
===================================================================
---
branches/3.1.x/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuGroup.jspx 2007-11-22
15:22:58 UTC (rev 4187)
+++
branches/3.1.x/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuGroup.jspx 2007-11-22
15:32:14 UTC (rev 4188)
@@ -27,7 +27,8 @@
<f:call name="utils.encodePassThru" />
- <tr class="#{this:getSelectedClass( context, component )}">
+ <tr id="row_#{clientId}"
+ class="#{this:getSelectedClass( context, component )}" >
<td class="dr-pmenu-nowrap #{this:getIconClass( context,
component,'left')}">
<f:call name="insertSpacerImages" />
<f:call name="insertImage">
Modified:
branches/3.1.x/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuItem.jspx
===================================================================
---
branches/3.1.x/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuItem.jspx 2007-11-22
15:22:58 UTC (rev 4187)
+++
branches/3.1.x/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuItem.jspx 2007-11-22
15:32:14 UTC (rev 4188)
@@ -23,7 +23,8 @@
<f:parameter value="onclick,onmousedown,onmouseup,onmousemove" />
</f:call>
- <tr>
+ <tr id="row_#{clientId}"
+ class="#{this:getSelectedClass( context, component )}" >
<f:call name="utils.encodeId"/>
<td class="dr-pmenu-nowrap #{this:getIconClass( context,
component,'left')}">
<f:call name="insertSpacerImages" />