Author: dbiatenia Date: 2007-08-07 12:45:45 -0400 (Tue, 07 Aug 2007) New Revision: 2113 Modified: trunk/ui/tooltip/src/main/java/org/richfaces/renderkit/html/ToolTipRenderer.java trunk/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js Log: separate js-variable removed Modified: trunk/ui/tooltip/src/main/java/org/richfaces/renderkit/html/ToolTipRenderer.java =================================================================== --- trunk/ui/tooltip/src/main/java/org/richfaces/renderkit/html/ToolTipRenderer.java 2007-08-07 16:44:11 UTC (rev 2112) +++ trunk/ui/tooltip/src/main/java/org/richfaces/renderkit/html/ToolTipRenderer.java 2007-08-07 16:45:45 UTC (rev 2113) @@ -218,10 +218,10 @@ // String jsVar = constructJSVariable(context, component); - script.append(getJsVarName(context, toolTip) + " = ").append(jsVar).append(";\n"); + script.append(jsVar).append(";\n"); ret.append(script.toString()); - ret.append("Richfaces.tooltips[\"" + toolTip.getClientId(context) + "\"] = ").append(jsVar).append(";\n"); + //ret.append("Richfaces.tooltips[\"" + toolTip.getClientId(context) + "\"] = ").append(jsVar).append(";\n"); // //ret.append("function toolTipAttach(){tooltip1.attachParentEvents() }\n"); @@ -243,7 +243,8 @@ } String events = "{event:\"" + event + "\",onshow:\"" + toolTip.getOnshow() + "\",oncomplete:\"" + toolTip.getOncomplete() + "\",onhide:\"" + toolTip.getOnhide() + - "\",delay:" + toolTip.getDelay() + ",jsVarName:\"" + getJsVarName(context, component) + "\"}"; + //"\",delay:" + toolTip.getDelay() + ",jsVarName:\"" + getJsVarName(context, component) + "\"}"; + "\",delay:" + toolTip.getDelay() + "}"; ret.append("new ToolTip(" + events).append(comma).append(quot).append( toolTip.getClientId(context)).append(quot).append(comma). append(quot).append(parentClientId).append(quot).append(comma). @@ -258,8 +259,9 @@ return ret.toString(); } + private String getJsVarName(FacesContext context, UIComponent component){ - return "window.tooltip" + component.getClientId(context).replaceAll("[^A-Za-z0-9_]", "_"); + return "Richfaces.tooltips[\'" + component.getParent().getClientId(context) + "\']"; } protected void doDecode(FacesContext context, UIComponent component) { 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-08-07 16:44:11 UTC (rev 2112) +++ trunk/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js 2007-08-07 16:45:45 UTC (rev 2113) @@ -11,7 +11,7 @@ this.oncomplete = events.oncomplete; this.onhide = events.onhide; this.delay = events.delay; - this.jsVarName = events.jsVarName; + //this.jsVarName = events.jsVarName; this.id = id; this.parentId = parentId; @@ -57,6 +57,8 @@ } if(!this.disabled) Event.observe(document.getElementsByTagName("body")[0], "mousemove", this.attachOnLoadEvents.bindAsEventListener(this), true); + //it means we have only one tooltip for elements + Richfaces.tooltips[parentId] = this; }, attachOnLoadEvents: function(){ if(!this.parentAttached){ @@ -125,7 +127,7 @@ eval(this.ajaxExecuteString); } if(this.delay > 0){ - setTimeout(this.jsVarName + '.displayDiv()', this.delay); + setTimeout('Richfaces.tooltips[\'' + this.parentId + '\'].displayDiv()', this.delay); } else { this.displayDiv(); }