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/24 14:50:52 UTC
git commit: WICKET-4669 Resources for Fragment in ModalWindow are not
added to the page head
Updated Branches:
refs/heads/master 6238bff69 -> a4437e67d
WICKET-4669 Resources for Fragment in ModalWindow are not added to the page head
First process header contributions, then priority-evaluations, then components, then onDomReady and finally normal evaluations.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/a4437e67
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/a4437e67
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/a4437e67
Branch: refs/heads/master
Commit: a4437e67dcddbd0e29238092ed16393dcddaf773
Parents: 6238bff
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Jul 24 15:49:40 2012 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Jul 24 15:49:40 2012 +0300
----------------------------------------------------------------------
.../wicket/ajax/res/js/wicket-ajax-jquery.js | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/a4437e67/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 64ac521..d4e9523 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
@@ -813,7 +813,9 @@
// go through the ajax response and execute all priority-invocations first
for (var i = 0; i < root.childNodes.length; ++i) {
var childNode = root.childNodes[i];
- if (childNode.tagName === "priority-evaluate") {
+ if (childNode.tagName === "header-contribution") {
+ this.processHeaderContribution(context, childNode);
+ } else if (childNode.tagName === "priority-evaluate") {
this.processEvaluation(context, childNode);
}
}
@@ -832,8 +834,6 @@
this.processComponent(context, node);
} else if (node.tagName === "evaluate") {
this.processEvaluation(context, node);
- } else if (node.tagName === "header-contribution") {
- this.processHeaderContribution(context, node);
} else if (node.tagName === "redirect") {
this.processRedirect(context, node);
}