Author: dashorst
Date: Mon Feb 28 14:54:29 2011
New Revision: 1075358
URL: http://svn.apache.org/viewvc?rev=1075358&view=rev
Log:
WICKET-3485: Link constructs URL when the link is disabled
Modified:
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/link/Link.java
Modified:
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/link/Link.java
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/link/Link.java?rev=1075358&r1=1075357&r2=1075358&view=diff
==============================================================================
---
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/link/Link.java
(original)
+++
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/link/Link.java
Mon Feb 28 14:54:29 2011
@@ -405,11 +405,6 @@ public abstract class Link<T> extends Ab
{
RequestCycle.get().setUrlForNewWindowEncoding();
}
- // 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())
@@ -418,6 +413,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"))
@@ -460,7 +461,6 @@ public abstract class Link<T> extends Ab
}
}
-
// If the subclass specified javascript, use that
final CharSequence onClickJavaScript =
getOnClickScript(url);
if (onClickJavaScript != null)
@@ -477,7 +477,6 @@ public abstract class Link<T> extends Ab
}
}
}
-
}
/**
