Author: abelevich Date: 2011-02-15 12:38:21 -0500 (Tue, 15 Feb 2011) New Revision: 21675 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/menugroup.js trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menuitem.js Log: https://issues.jboss.org/browse/RF-10507 class hardcoded in menu-base.js 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-15 17:35:56 UTC (rev 21674) +++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menu-base.js 2011-02-15 17:38:21 UTC (rev 21675) @@ -15,6 +15,7 @@ selectItemCss : "rf-ddm-itm-sel", unselectItemCss : "rf-ddm-itm-unsel", disabledItemCss : "rf-ddm-itm-dis", + labelCss: "rf-ddm-lbl", listCss : "rf-ddm-lst", listContainerCss : "rf-ddm-lst-bg" }; @@ -143,12 +144,12 @@ __getParentMenuFromItem : function(item) { var menu; if (item) - menu = item.parents('div.rf-ddm-itm') - .has('div.rf-ddm-lst-bg').eq(1); + menu = item.parents('div.'+this.options.itemCss) + .has('div.'+this.options.listContainerCss).eq(1); if (menu && menu.length > 0) return menu; else { - menu = item.parents('div.rf-ddm-lbl'); + menu = item.parents('div.'+this.options.labelCss); if (menu && menu.length > 0) return menu; else @@ -157,8 +158,8 @@ }, __getParentMenu : function() { - var menu = $(this.element).parents('div.rf-ddm-itm') - .has('div.rf-ddm-lst-bg').eq(0); + var menu = $(this.element).parents('div.'+this.options.itemCss) + .has('div.'+this.options.listContainerCss).eq(0); if (menu && menu.length > 0) return menu; else { 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-15 17:35:56 UTC (rev 21674) +++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menugroup.js 2011-02-15 17:38:21 UTC (rev 21675) @@ -5,8 +5,7 @@ direction : "AA", jointPoint : "AA", positionType : "DDMENUGROUP", - showDelay : 300, - itemCss : "rf-ddm-itm" + showDelay : 300 } // constructor definition rf.ui.MenuGroup = function(componentId, options) { @@ -59,12 +58,12 @@ }, select : function() { - this.jqueryElement.removeClass('rf-ddm-itm-unsel'); - this.jqueryElement.addClass('rf-ddm-itm-sel'); + this.jqueryElement.removeClass(this.options.unselectItemCss); + this.jqueryElement.addClass(this.options.selectItemCss); }, unselect : function() { - this.jqueryElement.removeClass('rf-ddm-itm-sel'); - this.jqueryElement.addClass('rf-ddm-itm-unsel'); + this.jqueryElement.removeClass(this.options.selectItemCss); + this.jqueryElement.addClass(this.options.unselectItemCss); }, __showHandler : function() { Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menuitem.js =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menuitem.js 2011-02-15 17:35:56 UTC (rev 21674) +++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menuitem.js 2011-02-15 17:38:21 UTC (rev 21675) @@ -1,9 +1,13 @@ (function($, rf) { rf.ui = rf.ui || {}; - var defaultOptions = { - mode : "server" - } + var defaultOptions = { + itemCss : "rf-ddm-itm", + selectItemCss : "rf-ddm-itm-sel", + unselectItemCss : "rf-ddm-itm-unsel", + labelCss: "rf-ddm-lbl", + mode : "server" + } // constructor definition @@ -29,13 +33,13 @@ return { name : "MenuItem", select : function() { - this.element.removeClass('rf-ddm-itm-unsel'); - this.element.addClass('rf-ddm-itm-sel'); + this.element.removeClass(this.options.unselectItemCss); + this.element.addClass(this.options.selectItemCss); this.selected = true; }, unselect : function() { - this.element.removeClass('rf-ddm-itm-sel'); - this.element.addClass('rf-ddm-itm-unsel'); + this.element.removeClass(this.options.selectItemCss); + this.element.addClass(this.options.unselectItemCss); this.selected = false; }, activate : function() { @@ -82,7 +86,7 @@ }, __getParentMenu : function() { - var menu = this.element.parents('div.rf-ddm-lbl'); + var menu = this.element.parents('div.'+this.options.labelCss); if (menu && menu.length > 0) return rf.$(menu); else