[richfaces-svn-commits] JBoss Rich Faces SVN: r14428 - in branches/community/3.3.X/ui/menu-components/src: main/resources/org/richfaces/renderkit/html/css and 3 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Tue Jun 2 04:52:36 EDT 2009
Author: konstantin.mishin
Date: 2009-06-02 04:52:36 -0400 (Tue, 02 Jun 2009)
New Revision: 14428
Modified:
branches/community/3.3.X/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java
branches/community/3.3.X/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/css/dropdownmenu.xcss
branches/community/3.3.X/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/css/menucomponents.xcss
branches/community/3.3.X/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js
branches/community/3.3.X/ui/menu-components/src/main/templates/org/richfaces/htmlMenuGroup.jspx
branches/community/3.3.X/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx
branches/community/3.3.X/ui/menu-components/src/test/java/org/richfaces/component/MenuGroupComponentTest.java
branches/community/3.3.X/ui/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java
Log:
RF-7225
Modified: branches/community/3.3.X/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java
===================================================================
--- branches/community/3.3.X/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java 2009-06-01 17:21:55 UTC (rev 14427)
+++ branches/community/3.3.X/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java 2009-06-02 08:52:36 UTC (rev 14428)
@@ -207,7 +207,7 @@
if (menuItem.isDisabled()) {
variables.setVariable("iconDisabledClasses",
- "dr-menu-icon-disabled rich-menu-item-icon-disabled");
+ "rich-menu-item-icon-disabled");
} else {
variables.setVariable("onmouseoutInlineStyles",
Modified: branches/community/3.3.X/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/css/dropdownmenu.xcss
===================================================================
--- branches/community/3.3.X/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/css/dropdownmenu.xcss 2009-06-01 17:21:55 UTC (rev 14427)
+++ branches/community/3.3.X/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/css/dropdownmenu.xcss 2009-06-02 08:52:36 UTC (rev 14428)
@@ -22,7 +22,7 @@
background : repeat-y left;
}
-.dr-menu-label {
+.rich-ddmenu-label, .rich-ddmenu-label-disabled {
left: 0px;
top: 0px;
padding : 2px 5px 2px 5px;
@@ -30,11 +30,11 @@
width : auto;
height : auto;
}
-.dr-menu-label-unselect {
+.rich-ddmenu-label-unselect {
border : 0px solid transparent;
padding : 3px 6px;
}
-.dr-menu-label-select {
+.rich-ddmenu-label-select {
border : 1px solid;
cursor : pointer;
}
@@ -60,7 +60,7 @@
</f:verbatim>
-<u:selector name=".dr-label-text-decor">
+<u:selector name=".rich-label-text-decor">
<u:style name="font-weight" skin="headerWeightFont" />
</u:selector>
@@ -78,18 +78,18 @@
<u:style name="border-right-color" skin="additionalBackgroundColor" />
</u:selector>
-<u:selector name=".dr-menu-label">
+<u:selector name=".rich-ddmenu-label, .rich-ddmenu-label-disabled">
<u:style name="font-family" skin="generalFamilyFont" />
<u:style name="font-size" skin="generalSizeFont" />
</u:selector>
-<u:selector name=".dr-menu-label-select">
+<u:selector name=".rich-ddmenu-label-select">
<u:style name="border-color" skin="panelBorderColor" />
<u:style name="background-color" skin="controlBackgroundColor" />
<u:style name="color" skin="generalTextColor" />
</u:selector>
-<u:selector name=".dr-ddmenu-label-disabled" >
+<u:selector name=".rich-ddmenu-label-disabled" >
<u:style name="color" skin="tabDisabledTextColor"/>
</u:selector>
Modified: branches/community/3.3.X/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/css/menucomponents.xcss
===================================================================
--- branches/community/3.3.X/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/css/menucomponents.xcss 2009-06-01 17:21:55 UTC (rev 14427)
+++ branches/community/3.3.X/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/css/menucomponents.xcss 2009-06-02 08:52:36 UTC (rev 14428)
@@ -28,17 +28,17 @@
border : 0px solid transparent;
cursor : default;
}
-.dr-menu-icon {
+.rich-menu-item-icon, .rich-menu-group-icon {
margin-right : 10px;
}
-.dr-menu-icon img {
+.rich-menu-item-icon img, .rich-menu-group-icon img {
vertical-align: middle;
}
.rich-menu-item a, .rich-menu-group a {
text-decoration : none;
}
-.dr-menu-node {
+.rich-menu-node {
position : absolute;
width : 16px;
height : 16px;
@@ -47,7 +47,7 @@
right : 1px;
}
-.rich-menu-item-disabled .dr-menu-node, .rich-menu-group-disabled .dr-menu-node {
+.rich-menu-item-disabled .rich-menu-node, .rich-menu-group-disabled .rich-menu-node {
background-position : bottom;
}
@@ -67,7 +67,7 @@
background : repeat-y left;
}
-.dr-menu-label {
+.rich-ddmenu-label, .rich-ddmenu-label-disabled {
left: 0px;
top: 0px;
padding : 2px 5px 2px 5px;
@@ -75,11 +75,11 @@
width : auto;
height : auto;
}
-.dr-menu-label-unselect {
+.rich-ddmenu-label-unselect {
border : 0px solid transparent;
padding : 3px 6px;
}
-.dr-menu-label-select {
+.rich-ddmenu-label-select {
border : 1px solid;
cursor : pointer;
}
@@ -126,13 +126,13 @@
<u:style name="background-color" skin="tipBackgroundColor" />
</u:selector>
-<u:selector name=".dr-menu-node-icon">
+<u:selector name=".rich-menu-node-icon">
<u:style name="background-image">
<f:resource f:key="org.richfaces.renderkit.html.images.MenuNodeImage"/>
</u:style>
</u:selector>
-<u:selector name=".dr-label-text-decor">
+<u:selector name=".rich-label-text-decor">
<u:style name="font-weight" skin="headerWeightFont" />
</u:selector>
@@ -150,12 +150,12 @@
<u:style name="border-right-color" skin="additionalBackgroundColor" />
</u:selector>
-<u:selector name=".dr-menu-label">
+<u:selector name=".rich-ddmenu-label, .rich-ddmenu-label-disabled">
<u:style name="font-family" skin="generalFamilyFont" />
<u:style name="font-size" skin="generalSizeFont" />
</u:selector>
-<u:selector name=".dr-menu-label-select">
+<u:selector name=".rich-ddmenu-label-select">
<u:style name="border-color" skin="panelBorderColor" />
<u:style name="background-color" skin="controlBackgroundColor" />
<u:style name="color" skin="generalTextColor" />
Modified: branches/community/3.3.X/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js
===================================================================
--- branches/community/3.3.X/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js 2009-06-01 17:21:55 UTC (rev 14427)
+++ branches/community/3.3.X/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js 2009-06-02 08:52:36 UTC (rev 14428)
@@ -422,7 +422,7 @@
var node = (e.target || e.srcElement);
var isLabel = false;
while (node && node.id != elementId.id) {
- if (node.className == 'dr-label-text-decor rich-label-text-decor') {//TODO: replace magic
+ if (node.className == 'rich-label-text-decor') {//TODO: replace magic
isLabel = true;
}
node = node.parentNode;
@@ -866,8 +866,8 @@
highlightLabel: function() {
var label1 = $(this.getLabel());
RichFaces.Menu.Items.replaceClasses(label1,
- ['dr-menu-label-unselect', 'rich-ddmenu-label-unselect'],
- ['dr-menu-label-select','rich-ddmenu-label-select']);
+ ['rich-ddmenu-label-unselect'],
+ ['rich-ddmenu-label-select']);
if (this.selectedClass) {
Element.addClassName(label1, this.selectedClass);
}
@@ -876,8 +876,8 @@
unHighlightLabel: function() {
var label1 = $(this.getLabel());
RichFaces.Menu.Items.replaceClasses(label1,
- ['dr-menu-label-select','rich-ddmenu-label-select'],
- ['dr-menu-label-unselect', 'rich-ddmenu-label-unselect']);
+ ['rich-ddmenu-label-select'],
+ ['rich-ddmenu-label-unselect']);
if (this.selectedClass) {
Element.removeClassName(label1, this.selectedClass);
}
@@ -1236,7 +1236,7 @@
itemHoverClassNames: ['rich-menu-item-hover'],
groupHoverClassNames: ['rich-menu-group-hover'],
iconClassNames : [],
- hoverIconClassNames: ['dr-menu-icon-selected', 'rich-menu-item-icon-selected'],
+ hoverIconClassNames: ['rich-menu-item-icon-selected'],
labelClassNames: [],
hoverLabelClassNames: ['rich-menu-item-label-selected'],
@@ -1526,7 +1526,7 @@
element.className = 'rich-menu-item rich-menu-item-enabled ' + (menuItemClass ? menuItemClass : '');
element.style.cssText = menuItemStyle;
- $(element.id + ':icon').className='dr-menu-icon rich-menu-item-icon ' + (iconClass ? iconClass : '');
+ $(element.id + ':icon').className='rich-menu-item-icon ' + (iconClass ? iconClass : '');
Element.removeClassName($(element.id + ':anchor'), 'rich-menu-item-label-selected');
}
@@ -1548,6 +1548,6 @@
element.className = 'rich-menu-item rich-menu-item-hover ' + (menuItemHoverClass ? menuItemHoverClass : '');
element.style.cssText = menuItemStyle;
- $(element.id + ':icon').className='dr-menu-icon dr-menu-icon-selected rich-menu-item-icon rich-menu-item-icon-selected ' + (iconClass ? iconClass : '');
+ $(element.id + ':icon').className='rich-menu-item-icon rich-menu-item-icon-selected ' + (iconClass ? iconClass : '');
Element.addClassName($(element.id + ':anchor'), 'rich-menu-item-label-selected');
}
Modified: branches/community/3.3.X/ui/menu-components/src/main/templates/org/richfaces/htmlMenuGroup.jspx
===================================================================
--- branches/community/3.3.X/ui/menu-components/src/main/templates/org/richfaces/htmlMenuGroup.jspx 2009-06-01 17:21:55 UTC (rev 14427)
+++ branches/community/3.3.X/ui/menu-components/src/main/templates/org/richfaces/htmlMenuGroup.jspx 2009-06-02 08:52:36 UTC (rev 14428)
@@ -31,7 +31,7 @@
onmouseover="RichFaces.Menu.groupMouseOver(event, this, '#{menuGroupHoverClass}', '#{onmouseoverInlineStyles}');">
<span id="#{clientId}:icon"
- class="dr-menu-icon #{menuGroupItemIconClass} #{component.attributes['iconClass']}">
+ class="#{menuGroupItemIconClass} #{component.attributes['iconClass']}">
<jsp:scriptlet>
<![CDATA[
boolean disabled = ((Boolean) component.getAttributes().get("disabled")).booleanValue();
@@ -64,7 +64,7 @@
if (iconFolderFacet != null && iconFolderFacet.isRendered()) {
]]>
</jsp:scriptlet>
- <div id="#{clientId}:folder" class="dr-menu-node #{menuGroupItemFolderClass}">
+ <div id="#{clientId}:folder" class="rich-menu-node #{menuGroupItemFolderClass}">
<jsp:scriptlet>
<![CDATA[
renderChild(context, iconFolderFacet);
@@ -75,7 +75,7 @@
<jsp:scriptlet>
<![CDATA[} else if (component.getAttributes().get(iconFolder)!=null) {]]>
</jsp:scriptlet>
- <div id="#{clientId}:folder" class="dr-menu-node #{menuGroupItemFolderClass} #{component.attributes['iconClass']}">
+ <div id="#{clientId}:folder" class="rich-menu-node #{menuGroupItemFolderClass} #{component.attributes['iconClass']}">
<img width="16" height="16" alt=""
style="#{component.attributes['iconStyle']}"
src="#{actualIconFolder}"/>
@@ -83,7 +83,7 @@
<jsp:scriptlet>
<![CDATA[} else {]]>
</jsp:scriptlet>
- <div id="#{clientId}:folder" class="dr-menu-node dr-menu-node-icon #{menuGroupItemFolderClass}">
+ <div id="#{clientId}:folder" class="rich-menu-node rich-menu-node-icon #{menuGroupItemFolderClass}">
<jsp:scriptlet><![CDATA[
writer.write(" ");
]]></jsp:scriptlet>
Modified: branches/community/3.3.X/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx
===================================================================
--- branches/community/3.3.X/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx 2009-06-01 17:21:55 UTC (rev 14427)
+++ branches/community/3.3.X/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx 2009-06-02 08:52:36 UTC (rev 14428)
@@ -79,7 +79,7 @@
<span id="#{clientId}:icon"
- class="dr-menu-icon rich-menu-item-icon #{iconDisabledClasses} #{component.attributes['iconClass']}"
+ class="rich-menu-item-icon #{iconDisabledClasses} #{component.attributes['iconClass']}"
style="#{component.attributes['iconStyle']}"
onContextMenu="Event.stop(event); return false;">
Modified: branches/community/3.3.X/ui/menu-components/src/test/java/org/richfaces/component/MenuGroupComponentTest.java
===================================================================
--- branches/community/3.3.X/ui/menu-components/src/test/java/org/richfaces/component/MenuGroupComponentTest.java 2009-06-01 17:21:55 UTC (rev 14427)
+++ branches/community/3.3.X/ui/menu-components/src/test/java/org/richfaces/component/MenuGroupComponentTest.java 2009-06-02 08:52:36 UTC (rev 14428)
@@ -212,9 +212,7 @@
HtmlElement span = page.getHtmlElementById(menuGroup.getClientId(facesContext) + ":icon");
assertNotNull(span);
assertEquals(HTML.SPAN_ELEM, span.getNodeName());
- classAttr = span.getAttributeValue(HTML.class_ATTRIBUTE);
- assertTrue(classAttr.contains("dr-menu-icon"));
- assertTrue(classAttr.contains("rich-menu-item-icon"));
+ classAttr = span.getAttributeValue(HTML.class_ATTRIBUTE); assertTrue(classAttr.contains("rich-menu-item-icon"));
assertTrue(classAttr.contains((String) menuGroup.getAttributes().get(
"iconClass")));
@@ -229,8 +227,8 @@
assertNotNull(div);
assertEquals(HTML.DIV_ELEM, div.getNodeName());
classAttr = div.getAttributeValue(HTML.class_ATTRIBUTE);
- assertTrue(classAttr.contains("dr-menu-node"));
- assertTrue(classAttr.contains("dr-menu-node-icon"));
+ assertTrue(classAttr.contains("rich-menu-node"));
+ assertTrue(classAttr.contains("rich-menu-node-icon"));
assertTrue(classAttr.contains("rich-menu-item-folder"));
}
Modified: branches/community/3.3.X/ui/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java
===================================================================
--- branches/community/3.3.X/ui/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java 2009-06-01 17:21:55 UTC (rev 14427)
+++ branches/community/3.3.X/ui/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java 2009-06-02 08:52:36 UTC (rev 14428)
@@ -184,9 +184,7 @@
assertNotNull(span);
assertEquals(HTML.SPAN_ELEM, span.getNodeName());
classAttr = span.getAttributeValue(HTML.class_ATTRIBUTE);
- assertTrue(classAttr.contains("dr-menu-icon"));
assertTrue(classAttr.contains("rich-menu-item-icon"));
- assertTrue(classAttr.contains("dr-menu-icon-disabled"));
assertTrue(classAttr.contains("rich-menu-item-icon-disabled"));
HtmlElement div = page.getHtmlElementById(menuItem
@@ -229,7 +227,6 @@
assertNotNull(span);
assertEquals(HTML.SPAN_ELEM, span.getNodeName());
classAttr = span.getAttributeValue(HTML.class_ATTRIBUTE);
- assertTrue(classAttr.contains("dr-menu-icon"));
assertTrue(classAttr.contains("rich-menu-item-icon"));
assertTrue(classAttr.contains((String) menuItem.getAttributes().get("iconClass")));
More information about the richfaces-svn-commits
mailing list