[richfaces-svn-commits] JBoss Rich Faces SVN: r5601 - branches/3.1.x/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts.
Author: nbelaevski
Date: 2008-01-24 11:58:55 -0500 (Thu, 24 Jan 2008)
New Revision: 5601
Modified:
branches/3.1.x/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js
Log:
http://jira.jboss.com/jira/browse/RF-1939
Modified:
branches/3.1.x/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js
===================================================================
---
branches/3.1.x/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js 2008-01-24
16:53:31 UTC (rev 5600)
+++
branches/3.1.x/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js 2008-01-24
16:58:55 UTC (rev 5601)
@@ -999,18 +999,27 @@
}
// if($(topLevel)){ CH-1518
- var onmouseover = function(e){
- if (!e) {
- e = window.event;
- }
-
+ var menuOn = function(e) {
RichFaces.Menu.Layers.showDropDownLayer(this.id, topLevel,
e,this.delay);
+ };
+
+ var mouseover = function(e) {
if (options.disabled == false && !RichFaces.Menu.isWithin(e,
$(topLevel))) {
this.highlightLabel();
}
-
- }.bindAsEventListener(this);
+ };
+ var menuOff = function(e) {
+ RichFaces.Menu.Layers.setLMTO(this.hideDelay);
+ RichFaces.Menu.Layers.clearPopUpTO();
+ };
+
+ var mouseout = function(e){
+ if (options.disabled == false && !RichFaces.Menu.isWithin(e,
$(topLevel))) {
+ this.unHighlightLabel();
+ }
+ };
+
if(!onEvt){
onEvt = 'onmouseover';
}
@@ -1020,24 +1029,32 @@
}
offEvt = this.eventJsToPrototype(offEvt);
- var dis = this;
- var onmouseout =
- function(e){
- RichFaces.Menu.Layers.setLMTO(this.hideDelay);
- RichFaces.Menu.Layers.clearPopUpTO();
- if (options.disabled == false && !RichFaces.Menu.isWithin(e,
$(topLevel))) {
- this.unHighlightLabel();
- }
- }.bindAsEventListener(this);
+ var addBinding = function(eventName, handler) {
+ var binding = new RichFaces.Menu.Layer.Binding(topLevel, eventName, handler);
+ this.bindings.push(binding);
+ binding.refresh();
+ }.bind(this);
-// var item = $(topLevel);
- var binding = new RichFaces.Menu.Layer.Binding(topLevel,onEvt, onmouseover);
- this.bindings.push(binding);
- binding.refresh();
- binding = new RichFaces.Menu.Layer.Binding (topLevel, offEvt, onmouseout);
- this.bindings.push(binding);
- binding.refresh();
-
+ if (onEvt == 'mouseover') {
+ addBinding(onEvt, function(e) {
+ menuOn.call(this, e);
+ mouseover.call(this, e);
+ }.bindAsEventListener(this));
+ } else {
+ addBinding(onEvt, menuOn.bindAsEventListener(this));
+ addBinding('mouseover', mouseover.bindAsEventListener(this));
+ }
+
+ if (offEvt == 'mouseout') {
+ addBinding(offEvt, function(e) {
+ menuOff.call(this, e);
+ mouseout.call(this, e);
+ }.bindAsEventListener(this));
+ } else {
+ addBinding(offEvt, menuOff.bindAsEventListener(this));
+ addBinding('mouseout', mouseout.bindAsEventListener(this));
+ }
+
RichFaces.Menu.Layers.horizontals[this.id] = topLevel;
// }
return this;