[richfaces-svn-commits] JBoss Rich Faces SVN: r19729 - in trunk: ui/output/ui/src/main/java/org/richfaces/component and 2 other directories.

Author: amarkhel Date: 2010-10-28 10:30:03 -0400 (Thu, 28 Oct 2010) New Revision: 19729 Modified: trunk/examples/output-demo/src/main/webapp/qunit/tooltip.xhtml trunk/ui/output/ui/src/main/java/org/richfaces/component/UITooltip.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TooltipRenderer.java trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/Tooltip.js Log: RF-9474 Tooltip component small fixes Modified: trunk/examples/output-demo/src/main/webapp/qunit/tooltip.xhtml =================================================================== --- trunk/examples/output-demo/src/main/webapp/qunit/tooltip.xhtml 2010-10-28 14:15:26 UTC (rev 19728) +++ trunk/examples/output-demo/src/main/webapp/qunit/tooltip.xhtml 2010-10-28 14:30:03 UTC (rev 19729) @@ -49,7 +49,7 @@ <div id="div" style="border: 2px solid red; background-color: #adff2f; width:300px; height:300px"> Hello - <pn:tooltip id="tooltip"> + <pn:tooltip id="tooltip" target="div"> ToolTip Yo!!! </pn:tooltip> </div> Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/UITooltip.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/UITooltip.java 2010-10-28 14:15:26 UTC (rev 19728) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/UITooltip.java 2010-10-28 14:30:03 UTC (rev 19729) @@ -57,7 +57,7 @@ } public String getTarget() { - return (String) getStateHelper().eval(PropertyKeys.target); + return (String) getStateHelper().eval(PropertyKeys.target, getParent().getClientId()); } public void setTarget(String target) { Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TooltipRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TooltipRenderer.java 2010-10-28 14:15:26 UTC (rev 19728) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TooltipRenderer.java 2010-10-28 14:30:03 UTC (rev 19729) @@ -163,6 +163,7 @@ options.put("showDelay", tooltip.getShowDelay()); options.put("showEvent", tooltip.getShowEvent()); options.put("followMouse", tooltip.isFollowMouse()); + options.put("target", tooltip.getTarget()); addEventOption(context, tooltip, options, HIDE); addEventOption(context, tooltip, options, SHOW); Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/Tooltip.js =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/Tooltip.js 2010-10-28 14:15:26 UTC (rev 19728) +++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/Tooltip.js 2010-10-28 14:30:03 UTC (rev 19729) @@ -116,36 +116,44 @@ * @param {Hash} options - params * */ init : function (componentId, options) { + this.id = componentId this.options = $.extend({}, DEFAULT_OPTIONS, this.options || {}, options || {}); this.attachToDom.call(this, componentId); - rf.ui.Tooltip.$super.constructor.call(this, componentId); - this.mode = TooltipMode.ajax; - this.options = options; + this.target = this.options.target; this.__addUserEventHandler("hide"); this.__addUserEventHandler("show"); this.__addUserEventHandler("beforehide"); this.__addUserEventHandler("beforeshow"); - this.popup = new RichFaces.ui.Popup(this.id + ":cntr", {attachTo: "div", attachToBody: false, positionType: "TOOLTIP", positionOffset: [200,200]}); + this.popup = new RichFaces.ui.Popup(this.id + ":cntr", { + attachTo: this.target, + attachToBody: false, + positionType: "TOOLTIP", + positionOffset: [200,200] + }); var tooltip = this; function mouseMoveHandler(event) { tooltip.popup.show(event); } - $("#div").bind(this.options.showEvent, function (event) { + $(this.options.target).bind(this.options.showEvent, function (event) { tooltip.show(event); - $("#div").bind("mousemove", mouseMoveHandler); + if (tooltip.options.followMouse) { + $(tooltip.target).bind("mousemove", mouseMoveHandler); + } }); - $("#div").bind(this.options.hideEvent, function (event) { + $(tooltip.target).bind(this.options.hideEvent, function (event) { tooltip.hide(); - $("#div").unbind("mousemove", mouseMoveHandler); + if (tooltip.options.followMouse) { + $(tooltip.target).unbind("mousemove", mouseMoveHandler); + } }); },