You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2012/05/18 12:04:09 UTC

git commit: WICKET-4559 Component#getMarkupId() generates id that gets hidden by AdBlock

Updated Branches:
  refs/heads/wicket-1.5.x 635885717 -> 326e6515d


WICKET-4559 Component#getMarkupId() generates id that gets hidden by AdBlock


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/326e6515
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/326e6515
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/326e6515

Branch: refs/heads/wicket-1.5.x
Commit: 326e6515dbbdcdcfc5cc6f9d0f32b60d6eca82b9
Parents: 6358857
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri May 18 12:02:34 2012 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri May 18 12:02:34 2012 +0200

----------------------------------------------------------------------
 .../src/main/java/org/apache/wicket/Component.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/326e6515/wicket-core/src/main/java/org/apache/wicket/Component.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Component.java b/wicket-core/src/main/java/org/apache/wicket/Component.java
index 60fce2b..37b85c9 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Component.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Component.java
@@ -1533,9 +1533,14 @@ public abstract class Component
 			return null;
 		}
 
-		final int generatedMarkupId = storedMarkupId instanceof Integer ? (Integer)storedMarkupId
+		int generatedMarkupId = storedMarkupId instanceof Integer ? (Integer)storedMarkupId
 			: getSession().nextSequenceValue();
 
+		if (generatedMarkupId == 0xAD) {
+			// WICKET-4559 skip suffix 'ad' because some ad-blocking solutions may hide the component
+			generatedMarkupId = getSession().nextSequenceValue();
+		}
+
 		if (storedMarkupId == null)
 		{
 			setMarkupIdImpl(generatedMarkupId);