You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jn...@apache.org on 2015/12/19 10:07:28 UTC
svn commit: r1720891 - in /ofbiz/trunk/framework/widget/src/org/ofbiz/widget:
model/ModelMenuItem.java renderer/macro/MacroMenuRenderer.java
Author: jnicolas
Date: Sat Dec 19 09:07:28 2015
New Revision: 1720891
URL: http://svn.apache.org/viewvc?rev=1720891&view=rev
Log:
JIRA-6706 - Correct the widget-style of the itemMenu inheritance for the contained hyperlink
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelMenuItem.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroMenuRenderer.java
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelMenuItem.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelMenuItem.java?rev=1720891&r1=1720890&r2=1720891&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelMenuItem.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelMenuItem.java Sat Dec 19 09:07:28 2015
@@ -524,9 +524,6 @@ public class ModelMenuItem extends Model
if (linkElement.getAttribute("text").isEmpty()) {
linkElement.setAttribute("text", parentMenuItem.getTitle().getOriginal());
}
- if (linkElement.getAttribute("style").isEmpty()) {
- linkElement.setAttribute("style", parentMenuItem.getWidgetStyle());
- }
this.link = new Link(linkElement);
}
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroMenuRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroMenuRenderer.java?rev=1720891&r1=1720890&r2=1720891&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroMenuRenderer.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroMenuRenderer.java Sat Dec 19 09:07:28 2015
@@ -296,10 +296,14 @@ public class MacroMenuRenderer implement
Map<String, Object> parameters = new HashMap<String, Object>();
String style = menuItem.getWidgetStyle();
if (menuItem.isSelected(context)) {
- style = menuItem.getSelectedStyle();
- if (UtilValidate.isEmpty(style)) {
- style = "selected";
+ String selectedStyle = menuItem.getSelectedStyle();
+ if (UtilValidate.isEmpty(selectedStyle)) {
+ selectedStyle = "selected";
}
+ if (UtilValidate.isNotEmpty(style)) {
+ style += " " ;
+ }
+ style += selectedStyle ;
}
if (this.isDisableIfEmpty(menuItem, context)) {
style = menuItem.getDisabledTitleStyle();