Author: nbelaevski Date: 2011-01-24 15:28:24 -0500 (Mon, 24 Jan 2011) New Revision: 21185 Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTooltip.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: https://issues.jboss.org/browse/RF-10285 Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTooltip.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTooltip.java 2011-01-24 19:38:25 UTC (rev 21184) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTooltip.java 2011-01-24 20:28:24 UTC (rev 21185) @@ -32,7 +32,12 @@ import org.richfaces.TooltipLayout; import org.richfaces.TooltipMode; -import org.richfaces.cdk.annotations.*; +import org.richfaces.cdk.annotations.Attribute; +import org.richfaces.cdk.annotations.EventName; +import org.richfaces.cdk.annotations.JsfComponent; +import org.richfaces.cdk.annotations.JsfRenderer; +import org.richfaces.cdk.annotations.Tag; +import org.richfaces.cdk.annotations.TagType; import org.richfaces.context.ExtendedVisitContext; import org.richfaces.context.ExtendedVisitContextMode; import org.richfaces.renderkit.MetaComponentRenderer; @@ -90,9 +95,6 @@ @Attribute(defaultValue = "Positioning.DEFAULT") public abstract Positioning getDirection(); - @Attribute - public abstract boolean isDisabled(); - @Attribute(defaultValue = "true") public abstract boolean isFollowMouse(); 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 2011-01-24 19:38:25 UTC (rev 21184) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TooltipRenderer.java 2011-01-24 20:28:24 UTC (rev 21185) @@ -169,7 +169,6 @@ options.put("attached", tooltip.isAttached()); options.put("offset", getOffset(tooltip)); options.put("mode", tooltip.getMode()); - options.put("disabled", tooltip.isDisabled()); options.put("hideDelay", tooltip.getHideDelay()); options.put("hideEvent", tooltip.getHideEvent()); options.put("showDelay", tooltip.getShowDelay()); 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 2011-01-24 19:38:25 UTC (rev 21184) +++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/tooltip.js 2011-01-24 20:28:24 UTC (rev 21185) @@ -39,7 +39,6 @@ offset : [10, 10], attached : true, mode : TooltipMode.DEFAULT, - disabled : false, hideDelay : 0, hideEvent : "mouseleave", showDelay : 0,