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 2022/01/24 08:16:54 UTC
[wicket] branch wicket-9.x updated (860c803 -> aaa160f)
This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a change to branch wicket-9.x
in repository https://gitbox.apache.org/repos/asf/wicket.git.
from 860c803 WICKET-6946 Document limitations of overriding isVisible/isEnabled
new 7fde2ad WICKET-6947 IndicatingAjaxButton does not work with Bootstrap 4
new d2e7ea7 WICKET-6947 IndicatingAjaxButton does not work with Bootstrap 4
new aaa160f WICKET-6947 IndicatingAjaxButton does not work with Bootstrap 4
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/wicket/ajax/res/js/wicket-ajax-jquery.js | 2 ++
wicket-core/src/test/js/dom.js | 19 ++++---------------
.../ajax/markup/html/AjaxIndicatorAppender.java | 12 +++---------
.../ajax/markup/html/IndicatingAjaxLink.java | 3 ---
4 files changed, 9 insertions(+), 27 deletions(-)
[wicket] 01/03: WICKET-6947 IndicatingAjaxButton does not work with Bootstrap 4
Posted by mg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a commit to branch wicket-9.x
in repository https://gitbox.apache.org/repos/asf/wicket.git
commit 7fde2adec3006b73fb3f4f875050cd95dbc955f4
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
AuthorDate: Mon Jan 24 08:37:28 2022 +0200
WICKET-6947 IndicatingAjaxButton does not work with Bootstrap 4
Remove/add hidden="" when showing/hiding an HTML element
Signed-off-by: Martin Tzvetanov Grigorov <mg...@apache.org>
---
.../src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js | 2 ++
1 file changed, 2 insertions(+)
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
index 8d351f5..7eaa51a 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
@@ -1333,6 +1333,7 @@
} else {
e.style.display = display;
}
+ e.removeAttribute("hidden");
}
},
@@ -1341,6 +1342,7 @@
e = Wicket.$(e);
if (e !== null) {
jQuery(e).hide();
+ e.setAttribute("hidden", "");
}
},
[wicket] 03/03: WICKET-6947 IndicatingAjaxButton does not work with Bootstrap 4
Posted by mg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a commit to branch wicket-9.x
in repository https://gitbox.apache.org/repos/asf/wicket.git
commit aaa160f26572bc64b4859c262ad15d61bb6a399e
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
AuthorDate: Mon Jan 24 10:12:47 2022 +0200
WICKET-6947 IndicatingAjaxButton does not work with Bootstrap 4
It seems after adding 'e.setAttribute("hidden", "");' to
Wicket.DOM.hide() the style.display is always inline/block, as in jQuery
1.x/2.x
Signed-off-by: Martin Tzvetanov Grigorov <mg...@apache.org>
---
wicket-core/src/test/js/dom.js | 19 ++++---------------
1 file changed, 4 insertions(+), 15 deletions(-)
diff --git a/wicket-core/src/test/js/dom.js b/wicket-core/src/test/js/dom.js
index 86e3b2f..1b169ab 100644
--- a/wicket-core/src/test/js/dom.js
+++ b/wicket-core/src/test/js/dom.js
@@ -121,11 +121,7 @@ jQuery(document).ready(function() {
Wicket.DOM.showIncrementally(el);
equal( el.style.display, 'none', ".style.display should still be 'none'." );
Wicket.DOM.showIncrementally(el);
- if (jQuery.fn.jquery.indexOf("3") === 0) {
- equal( el.style.display, '', "Wicket.DOM.show should set .style.display to ''." );
- } else {
- equal( el.style.display, 'inline', "Wicket.DOM.show should set .style.display to 'inline'." );
- }
+ equal( el.style.display, 'inline', "Wicket.DOM.show should set .style.display to 'inline'." );
});
test("(show|hide)Incrementally() an element by id ", function() {
@@ -136,11 +132,7 @@ jQuery(document).ready(function() {
Wicket.DOM.showIncrementally(existingId);
equal( Wicket.$(existingId).style.display, 'none', ".style.display should still be 'none'." );
Wicket.DOM.showIncrementally(existingId);
- if (jQuery.fn.jquery.indexOf("3") === 0) {
- equal(Wicket.$(existingId).style.display, '', "Wicket.DOM.show should set .style.display to ''.");
- } else {
- equal(Wicket.$(existingId).style.display, 'inline', "Wicket.DOM.show should set .style.display to 'inline'.");
- }
+ equal(Wicket.$(existingId).style.display, 'inline', "Wicket.DOM.show should set .style.display to 'inline'.");
});
test("(show|hide)Incrementally() a block element by id ", function() {
@@ -152,11 +144,8 @@ jQuery(document).ready(function() {
Wicket.DOM.showIncrementally(elId);
equal( Wicket.$(elId).style.display, 'none', ".style.display should still be 'none'." );
Wicket.DOM.showIncrementally(elId);
- if (jQuery.fn.jquery.indexOf("3") === 0) {
- equal(Wicket.$(elId).style.display, '', "Wicket.DOM.show should set .style.display to ''.");
- } else {
- equal(Wicket.$(elId).style.display, 'block', "Wicket.DOM.show should set .style.display to 'block'.");
- }
+ window.console.log('====== JQUERY version', jQuery.fn.jquery);
+ equal(Wicket.$(elId).style.display, 'block', "Wicket.DOM.show should set .style.display to 'block'.");
});
test("hide() an element", function() {
[wicket] 02/03: WICKET-6947 IndicatingAjaxButton does not work with Bootstrap 4
Posted by mg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a commit to branch wicket-9.x
in repository https://gitbox.apache.org/repos/asf/wicket.git
commit d2e7ea7e78d5743bc8caae5642d34e305498f03b
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
AuthorDate: Mon Jan 24 08:38:09 2022 +0200
WICKET-6947 IndicatingAjaxButton does not work with Bootstrap 4
Non-functional changes.
Minor cleanup
Fix a typo in javadoc
Signed-off-by: Martin Tzvetanov Grigorov <mg...@apache.org>
---
.../extensions/ajax/markup/html/AjaxIndicatorAppender.java | 12 +++---------
.../extensions/ajax/markup/html/IndicatingAjaxLink.java | 3 ---
2 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxIndicatorAppender.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxIndicatorAppender.java
index 770ca19..3a5c2e5 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxIndicatorAppender.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxIndicatorAppender.java
@@ -44,16 +44,13 @@ import org.apache.wicket.request.resource.ResourceReference;
*/
public class AjaxIndicatorAppender extends Behavior
{
+ private static final long serialVersionUID = 1L;
+
/**
* Component instance this behavior is bound to
*/
private Component component;
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
private final ResourceReference indicator;
/**
@@ -65,7 +62,7 @@ public class AjaxIndicatorAppender extends Behavior
}
/**
- * Build a new instance specifing a custom busy indicator as {@link ResourceReference}.
+ * Build a new instance specifying a custom busy indicator as {@link ResourceReference}.
*
* @param indicator
* The {@link ResourceReference} to use as busy indicator.
@@ -135,9 +132,6 @@ public class AjaxIndicatorAppender extends Behavior
return component.getMarkupId() + "--ajax-indicator";
}
- /**
- * @see org.apache.wicket.behavior.Behavior#bind(org.apache.wicket.Component)
- */
@Override
public final void bind(final Component component)
{
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/IndicatingAjaxLink.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/IndicatingAjaxLink.java
index c428937..02aa57e 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/IndicatingAjaxLink.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/IndicatingAjaxLink.java
@@ -60,9 +60,6 @@ public abstract class IndicatingAjaxLink<T> extends AjaxLink<T> implements IAjax
add(indicatorAppender);
}
- /**
- * @see org.apache.wicket.ajax.IAjaxIndicatorAware#getAjaxIndicatorMarkupId()
- */
@Override
public String getAjaxIndicatorMarkupId()
{