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 2013/02/06 09:52:00 UTC
[11/38] git commit: WICKET-5010 Improve wicket-ajax.js to be able to
work with jQuery 1.9+
WICKET-5010 Improve wicket-ajax.js to be able to work with jQuery 1.9+
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/267c4ebf
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/267c4ebf
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/267c4ebf
Branch: refs/heads/reference-guide
Commit: 267c4ebf231af73161c83137a649eb93063155c4
Parents: 63a2cae
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Jan 28 15:15:22 2013 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Jan 28 15:19:03 2013 +0100
----------------------------------------------------------------------
.../wicket/ajax/res/js/wicket-ajax-jquery.js | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/267c4ebf/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 0092d05..3921bf2 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
@@ -1505,7 +1505,13 @@
document.title = titleText;
return;
} else {
- var $newElement = jQuery(text);
+ // jQuery 1.9+ doesn't allow new line in the text
+ var cleanedText = text.replace(/\n|\r/g, '');
+
+ // jQuery 1.9+ expects '<' as the very first character in text
+ cleanedText = jQuery.trim(cleanedText);
+
+ var $newElement = jQuery(cleanedText);
// WICKET-4236
jQuery(element).after($newElement).remove();
}