Author: abelevich
Date: 2011-01-17 07:27:38 -0500 (Mon, 17 Jan 2011)
New Revision: 21044
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/menuKeyNavigation.js
Log:
https://issues.jboss.org/browse/RF-10219 dropDownMenu: need to make visual and behavior
corrections. appearance and custor.
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-01-17
10:58:01 UTC (rev 21043)
+++
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menu-base.js 2011-01-17
12:27:38 UTC (rev 21044)
@@ -125,9 +125,13 @@
this.displayed = false;
this.__deselectCurrentItem();
this.currentSelectedItemIndex = -1;
+ jqueryParentMenu=this.__getParentMenu();
parentMenu = rf.$(this.__getParentMenu());
- parentMenu.popupElement.focus();
- rf.ui.MenuManager.setActiveSubMenu(parentMenu);
+ if (this.id != parentMenu.id)
+ {
+ parentMenu.popupElement.focus();
+ rf.ui.MenuManager.setActiveSubMenu(parentMenu);
+ }
}
},
Modified:
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menuKeyNavigation.js
===================================================================
---
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menuKeyNavigation.js 2011-01-17
10:58:01 UTC (rev 21043)
+++
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menuKeyNavigation.js 2011-01-17
12:27:38 UTC (rev 21044)
@@ -91,10 +91,8 @@
var item = this.__getItemByIndex(this.currentSelectedItemIndex);
var menu;
menu = this.__getParentMenu()||this.__getParentMenuFromItem(item);
- if (menu != null){
+ if (menu != null && this.id != rf.$(menu).id){
this.hide();
-// this.active=false;
-// rf.$(menu).active=true;
rf.$(menu).popupElement.focus();
} else {
this.hide();