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 2012/07/23 10:44:38 UTC

[1/3] git commit: WICKET-4652 AbstractAjaxTimerBehavior throws ComponentNotFoundException when its component is replaced in PageMap.

Updated Branches:
  refs/heads/master 9de425ea4 -> 382431639


WICKET-4652 AbstractAjaxTimerBehavior throws ComponentNotFoundException when its component is replaced in PageMap.

Always use the default precondition, in addition to custom ones.


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/38243163
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/38243163
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/38243163

Branch: refs/heads/master
Commit: 3824316399e0bbdbc641d1e9e06806a2fe0d3a65
Parents: a1cd318
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Jul 23 11:43:52 2012 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Jul 23 11:43:52 2012 +0300

----------------------------------------------------------------------
 .../wicket/ajax/res/js/wicket-ajax-jquery.js       |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/38243163/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 f1791bd..44fb6c5 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
@@ -492,7 +492,8 @@
 				context: self,
 				beforeSend: function (jqXHR, settings) {
 
-					var preconditions = attrs.pre || defaultPrecondition;
+					var preconditions = attrs.pre || [];
+					preconditions = defaultPrecondition.concat(preconditions);
 					if (jQuery.isArray(preconditions)) {
 						for (var p = 0; p < preconditions.length; p++) {