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/05 13:48:03 UTC
git commit: WICKET-5523 Ajax indicator not working when display is
set to none in css
Repository: wicket
Updated Branches:
refs/heads/master da1555036 -> 3c01c731d
WICKET-5523 Ajax indicator not working when display is set to none in css
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/3c01c731
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/3c01c731
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/3c01c731
Branch: refs/heads/master
Commit: 3c01c731d52d8ec8b5d25160968ce758208b4543
Parents: da15550
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Mar 5 14:46:06 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Mar 5 14:47:25 2014 +0200
----------------------------------------------------------------------
.../java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js | 2 +-
wicket-core/src/test/js/ajax.js | 3 ++-
wicket-core/src/test/js/dom.js | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/3c01c731/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
----------------------------------------------------------------------
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 ca6aecf..b449b23 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
@@ -1620,7 +1620,7 @@
var count = e.getAttribute("showIncrementallyCount");
count = parseInt(isUndef(count) ? 0 : count, 10);
if (count >= 0) {
- Wicket.DOM.show(e);
+ Wicket.DOM.show(e, 'block');
}
e.setAttribute("showIncrementallyCount", count + 1);
},
http://git-wip-us.apache.org/repos/asf/wicket/blob/3c01c731/wicket-core/src/test/js/ajax.js
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/js/ajax.js b/wicket-core/src/test/js/ajax.js
index 0a8251b..dd061a7 100644
--- a/wicket-core/src/test/js/ajax.js
+++ b/wicket-core/src/test/js/ajax.js
@@ -573,7 +573,7 @@ jQuery(document).ready(function() {
asyncTest('show/hide incrementally (WICKET-4364)', function() {
- expect(4);
+ expect(6);
var $indicator = jQuery('<div id="indicator"></div>');
var $el = jQuery('<div id="elementId"></div>');
@@ -591,6 +591,7 @@ jQuery(document).ready(function() {
var successFailureHandler = function () {
var count = getCurrentCount();
ok(count === 1 || count === 2, "'showIncrementallyCount' must be 1 or 2. Value is: " + count);
+ equal('block', $indicator.css('display'), "Indicator's display must be 'block'");
};
var attrs = {
http://git-wip-us.apache.org/repos/asf/wicket/blob/3c01c731/wicket-core/src/test/js/dom.js
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/js/dom.js b/wicket-core/src/test/js/dom.js
index 4b68250..dd34ba0 100644
--- a/wicket-core/src/test/js/dom.js
+++ b/wicket-core/src/test/js/dom.js
@@ -152,7 +152,7 @@ jQuery(document).ready(function() {
Wicket.DOM.showIncrementally(el);
equal( el.style.display, 'none', ".style.display should still be 'none'." );
Wicket.DOM.showIncrementally(el);
- equal( el.style.display, '', "Wicket.DOM.show should set .style.display to ''." );
+ equal( el.style.display, 'block', "Wicket.DOM.show should set .style.display to 'block'." );
});
test("(show|hide)Incrementally() an element by id ", function() {
@@ -163,7 +163,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);
- equal( Wicket.$(existingId).style.display, '', "Wicket.DOM.show should set .style.display to ''." );
+ equal( Wicket.$(existingId).style.display, 'block', "Wicket.DOM.show should set .style.display to 'block'." );
});
test("hide() an element", function() {