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:17:05 UTC
[wicket] branch master updated: WICKET-6947 IndicatingAjaxButton does not work with Bootstrap 4
This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git
The following commit(s) were added to refs/heads/master by this push:
new 1c56912 WICKET-6947 IndicatingAjaxButton does not work with Bootstrap 4
1c56912 is described below
commit 1c569121775ddb68a04f390f156c77a5c007426a
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>
(cherry picked from commit aaa160f26572bc64b4859c262ad15d61bb6a399e)
---
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() {