Repository: syncope Updated Branches: refs/heads/2_0_X 2e174d421 -> d1e14c106
wicket & wicket bootstrap upgrade version Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/d1e14c10 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/d1e14c10 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/d1e14c10 Branch: refs/heads/2_0_X Commit: d1e14c1068067e527a14ed331401d53671e2fdb2 Parents: 2e174d4 Author: fmartelli <[email protected]> Authored: Mon May 22 12:18:09 2017 +0200 Committer: fmartelli <[email protected]> Committed: Mon May 22 12:18:09 2017 +0200 ---------------------------------------------------------------------- .../wicket/markup/html/form/IndicatingOnConfirmAjaxLink.java | 3 ++- .../console/wicket/markup/html/bootstrap/dialog/BaseModal.html | 2 +- pom.xml | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/d1e14c10/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/IndicatingOnConfirmAjaxLink.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/IndicatingOnConfirmAjaxLink.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/IndicatingOnConfirmAjaxLink.java index 53ab39c..b610117 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/IndicatingOnConfirmAjaxLink.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/IndicatingOnConfirmAjaxLink.java @@ -21,6 +21,7 @@ package org.apache.syncope.client.console.wicket.markup.html.form; import static de.agilecoders.wicket.jquery.JQuery.$; import de.agilecoders.wicket.jquery.function.JavaScriptInlineFunction; +import java.util.ArrayList; import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxLink; import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.head.JavaScriptHeaderItem; @@ -67,7 +68,7 @@ public abstract class IndicatingOnConfirmAjaxLink<T> extends IndicatingAjaxLink< + " })" + "} else {" + " proceed = false;" - + "};" + + "};", new ArrayList<CharSequence>() )).asDomReadyScript()); } } http://git-wip-us.apache.org/repos/asf/syncope/blob/d1e14c10/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/bootstrap/dialog/BaseModal.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/bootstrap/dialog/BaseModal.html b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/bootstrap/dialog/BaseModal.html index ddf2c9e..95c6232 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/bootstrap/dialog/BaseModal.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/bootstrap/dialog/BaseModal.html @@ -30,7 +30,7 @@ under the License. <div class="modal-dialog" wicket:id="dialog"> <div class="modal-content"> <div wicket:id="header" class="modal-header"> - <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> + <button wicket:id="header-close-button" type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> <h4 wicket:id="header-label" class="modal-title">Modal header</h4> </div> <div class="modal-body"> http://git-wip-us.apache.org/repos/asf/syncope/blob/d1e14c10/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 825031b..b772e59 100644 --- a/pom.xml +++ b/pom.xml @@ -424,9 +424,9 @@ under the License. <codemirror.version>5.24.2</codemirror.version> <jsplumb.version>2.0.7</jsplumb.version> - <wicket.version>7.6.0</wicket.version> - <wicket-jqueryui.version>7.6.0</wicket-jqueryui.version> - <wicket-bootstrap.version>0.10.11</wicket-bootstrap.version> + <wicket.version>7.7.0</wicket.version> + <wicket-jqueryui.version>7.7.0</wicket-jqueryui.version> + <wicket-bootstrap.version>0.10.13</wicket-bootstrap.version> <wicket-chartjs.version>7.0.1</wicket-chartjs.version> <angular.version>1.6.4</angular.version>
