Author: pyaschenko
Date: 2007-10-18 08:34:45 -0400 (Thu, 18 Oct 2007)
New Revision: 3439
Modified:
trunk/samples/tooltip-sample/src/main/java/org/richfaces/Bean.java
trunk/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js
Log:
RF-1101
Modified: trunk/samples/tooltip-sample/src/main/java/org/richfaces/Bean.java
===================================================================
--- trunk/samples/tooltip-sample/src/main/java/org/richfaces/Bean.java 2007-10-18 12:22:17
UTC (rev 3438)
+++ trunk/samples/tooltip-sample/src/main/java/org/richfaces/Bean.java 2007-10-18 12:34:45
UTC (rev 3439)
@@ -35,9 +35,18 @@
String text1 = "ToolTip content1";
String text2 = "ToolTip content2";
String text3 = "ToolTip content3";
+ boolean check = false;
private int counter;
+ public boolean getCheck() {
+ return check;
+ }
+
+ public void toggleCheck() {
+ check = !check;
+ }
+
public String getText() {
return text;
}
Modified:
trunk/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js
===================================================================
---
trunk/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js 2007-10-18
12:22:17 UTC (rev 3438)
+++
trunk/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js 2007-10-18
12:34:45 UTC (rev 3439)
@@ -85,12 +85,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;