Author: pyaschenko Date: 2007-10-18 08:51:11 -0400 (Thu, 18 Oct 2007) New Revision: 3441 Modified: branches/3.1.x/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js Log: RF-1101 Modified: branches/3.1.x/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js =================================================================== --- branches/3.1.x/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js 2007-10-18 12:50:31 UTC (rev 3440) +++ branches/3.1.x/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js 2007-10-18 12:51:11 UTC (rev 3441) @@ -78,12 +78,18 @@ destroy: function() { - if (!this.parentAttached) Event.stopObserving(document, "mousemove", this.attachOnLoadEventsListner, true); - else if (this.followMouse) Event.stopObserving(this.parent, 'mousemove', this.setToolTipPositionListner, false); + if (!this.parentAttached) + { + if (!this.disabled) Event.stopObserving(document, "mousemove", this.attachOnLoadEventsListner, true); + } + else + { + if (this.followMouse) Event.stopObserving(this.parent, 'mousemove', this.setToolTipPositionListner, false); - Event.stopObserving(this.parent, this.event, this.customEventHandlerListner, false); - Event.stopObserving(this.parent, "mouseout", this.doHideListner, false); - Event.stopObserving(this.toolTip, 'mouseout', this.leaveToolTipListner, false); + Event.stopObserving(this.parent, this.event, this.customEventHandlerListner, false); + Event.stopObserving(this.parent, "mouseout", this.doHideListner, false); + Event.stopObserving(this.toolTip, 'mouseout', this.leaveToolTipListner, false); + } this.hintParentElement = null; this.parent = null;