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 2014/03/19 16:31:33 UTC
[1/2] git commit: Upgrade Jacoco
Repository: wicket
Updated Branches:
refs/heads/master 8cb208b1d -> 329b9454a
Upgrade Jacoco
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/6434c830
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/6434c830
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/6434c830
Branch: refs/heads/master
Commit: 6434c830f5181f0162f1b4158c5bc924560bfd40
Parents: 8cb208b
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Mar 19 17:29:30 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Mar 19 17:29:30 2014 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/6434c830/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 173cf80..5cf0e92 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<mvn.build.java.version>1.7</mvn.build.java.version>
- <jacoco.version>0.6.4.201312101107</jacoco.version>
+ <jacoco.version>0.7.0.201403182114</jacoco.version>
<jetty.version>8.1.14.v20131031</jetty.version>
<jetty9.version>9.0.7.v20131107</jetty9.version>
<spring.version>4.0.2.RELEASE</spring.version>
[2/2] git commit: WICKET-5537 Wicket.DOM.toggleClass is called with
additional "#" inside AutoLabelResolver
Posted by mg...@apache.org.
WICKET-5537 Wicket.DOM.toggleClass is called with additional "#" inside AutoLabelResolver
(cherry picked from commit 469f189c09af1c72a56ec8779c88ff4b64a97d16)
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/329b9454
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/329b9454
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/329b9454
Branch: refs/heads/master
Commit: 329b9454abeabe947c1ed4b54c496cd7a6eb714f
Parents: 6434c83
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Mar 19 17:30:49 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Mar 19 17:31:24 2014 +0200
----------------------------------------------------------------------
.../org/apache/wicket/markup/html/form/AutoLabelResolver.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/329b9454/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AutoLabelResolver.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AutoLabelResolver.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AutoLabelResolver.java
index eb31871..94a32ba 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AutoLabelResolver.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AutoLabelResolver.java
@@ -226,14 +226,14 @@ public class AutoLabelResolver implements IComponentResolver
if (isRequired() != required)
{
- target.appendJavaScript(String.format("Wicket.DOM.toggleClass('#%s', '%s', %s);",
+ target.appendJavaScript(String.format("Wicket.DOM.toggleClass('%s', '%s', %s);",
getLabelIdFor(component), component.getString(CSS_REQUIRED_KEY, null, CSS_REQUIRED_DEFAULT),
required));
}
if (isEnabled() != enabled)
{
- target.appendJavaScript(String.format("Wicket.DOM.toggleClass('#%s', '%s', %s);",
+ target.appendJavaScript(String.format("Wicket.DOM.toggleClass('%s', '%s', %s);",
getLabelIdFor(component), component.getString(CSS_DISABLED_KEY, null, CSS_DISABLED_DEFAULT),
!enabled));
}