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 2017/03/20 20:59:11 UTC

[28/48] wicket git commit: WICKET-6340 improve support for XHTML markup

WICKET-6340 improve support for XHTML markup


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

Branch: refs/heads/master
Commit: 89e509f1992a4d5c8c2e8d7700106b2ff389ce6d
Parents: 90eb582
Author: Sven Meier <sv...@apache.org>
Authored: Fri Mar 17 21:23:04 2017 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Mar 20 21:42:32 2017 +0100

----------------------------------------------------------------------
 .../org/apache/wicket/ajax/res/js/wicket-ajax-jquery-debug.js   | 5 +++--
 .../java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js    | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/89e509f1/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery-debug.js
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery-debug.js b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery-debug.js
index 4287410..58425c3 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery-debug.js
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery-debug.js
@@ -90,8 +90,9 @@
 			msg = msg.replace(/</g, "&lt;");
 			msg = msg.replace(/>/g, "&gt;");
 			msg = msg.replace(/\n/g, "<br/>");
-			msg = msg.replace(/ /g, "&nbsp;");
-			msg = msg.replace(/\t/g, "&nbsp;&nbsp;&nbsp;&nbsp;");
+			// WICKET-6340 do not use nbsp, it may not be defined in XHTML markup
+			msg = msg.replace(/ /g, "&#160;");
+			msg = msg.replace(/\t/g, "&#160;&#160;&#160;&#160;");
 
 			if (typeof(label) !== "undefined") {
 				msg = "<b>" + label + "</b>" + msg;

http://git-wip-us.apache.org/repos/asf/wicket/blob/89e509f1/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 f0c5c12..0f25238 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
@@ -68,8 +68,9 @@
 	 * @param iframeName {String} the value of the iframe's name attribute
 	 */
 	createIFrame = function (iframeName) {
+		// WICKET-6340 properly close tag for XHTML markup
 		var $iframe = jQuery('<iframe name="'+iframeName+'" id="'+iframeName+
-			'" src="about:blank" style="position: absolute; top: -9999px; left: -9999px;">');
+			'" src="about:blank" style="position: absolute; top: -9999px; left: -9999px;"></iframe>');
 		return $iframe[0];
 	};