Repository: wicket
Updated Branches:
  refs/heads/wicket-6.x 9f2ca1478 -> 1b6ab749a


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/1b6ab749
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/1b6ab749
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/1b6ab749

Branch: refs/heads/wicket-6.x
Commit: 1b6ab749a79e9a921f50c296ab48a06cef43f3f1
Parents: 9f2ca14
Author: Sven Meier <[email protected]>
Authored: Fri Mar 17 21:23:04 2017 +0100
Committer: Sven Meier <[email protected]>
Committed: Fri Mar 17 21:34:47 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/1b6ab749/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 a8dd7bb..89801c1 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/1b6ab749/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 b2265a8..2f6bf59 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];
        };
 

Reply via email to