Author: dashorst
Date: Mon Feb 28 15:05:45 2011
New Revision: 1075366
URL: http://svn.apache.org/viewvc?rev=1075366&view=rev
Log:
WICKET-3485: Link constructs URL when the link is disabled
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/link/Link.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/link/Link.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/link/Link.java?rev=1075366&r1=1075365&r2=1075366&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/link/Link.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/link/Link.java
Mon Feb 28 15:05:45 2011
@@ -349,12 +349,6 @@ public abstract class Link<T> extends Ab
// Default handling for tag
super.onComponentTag(tag);
- // Set href to link to this link's linkClicked method
- CharSequence url = getURL();
-
- // append any anchor
- url = appendAnchor(tag, url);
-
// If we're disabled
if (!isLinkEnabled())
{
@@ -362,6 +356,12 @@ public abstract class Link<T> extends Ab
}
else
{
+ // Set href to link to this link's linkClicked method
+ CharSequence url = getURL();
+
+ // append any anchor
+ url = appendAnchor(tag, url);
+
// if the tag is an anchor proper
if (tag.getName().equalsIgnoreCase("a") ||
tag.getName().equalsIgnoreCase("link") ||
tag.getName().equalsIgnoreCase("area"))
@@ -413,7 +413,6 @@ public abstract class Link<T> extends Ab
tag.put("onclick", onClickJavaScript);
}
}
-
}
/**
