diff options
| -rw-r--r-- | src/core.js | 2 | ||||
| -rw-r--r-- | src/manipulation.js | 5 | ||||
| -rw-r--r-- | test/unit/manipulation.js | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/core.js b/src/core.js index 4091111a9..5cb0220e1 100644 --- a/src/core.js +++ b/src/core.js @@ -29,7 +29,7 @@ var jQuery = function( selector, context ) { rnotwhite = /\S/, // Used for trimming whitespace - rtrim = /(\s|\u00A0)+|(\s|\u00A0)+$/g, + rtrim = /^(\s|\u00A0)+|(\s|\u00A0)+$/g, // Match a standalone tag rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>)?$/, diff --git a/src/manipulation.js b/src/manipulation.js index 7128d11cf..7d7038ee2 100644 --- a/src/manipulation.js +++ b/src/manipulation.js @@ -388,7 +388,7 @@ jQuery.extend({ context = context.ownerDocument || context[0] && context[0].ownerDocument || document; } - var ret = [], div = context.createElement("div"); + var ret = []; jQuery.each(elems, function(i, elem){ if ( typeof elem === "number" ) { @@ -408,7 +408,8 @@ jQuery.extend({ // Trim whitespace, otherwise indexOf won't work as expected var tag = (rtagName.exec( elem ) || ["", ""])[1].toLowerCase(), wrap = wrapMap[ tag ] || wrapMap._default, - depth = wrap[0]; + depth = wrap[0], + div = context.createElement("div"); // Go to html and back, then peel off extra wrappers div.innerHTML = wrap[1] + elem + wrap[2]; diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js index c8ea240b8..75a1baa1f 100644 --- a/test/unit/manipulation.js +++ b/test/unit/manipulation.js @@ -151,7 +151,7 @@ test("unwrap()", function() { }); var testAppend = function(valueObj) { - expect(21); + expect(22); var defaultText = 'Try them out:' var result = jQuery('#first').append(valueObj('<b>buga</b>')); equals( result.text(), defaultText + 'buga', 'Check if text appending works' ); @@ -224,6 +224,8 @@ var testAppend = function(valueObj) { t( "Append Select", "#appendSelect1, #appendSelect2", ["appendSelect1", "appendSelect2"] ); + equals( "Two nodes", jQuery('<div />').append("Two", " nodes").text(), "Appending two text nodes (#4011)" ); + // using contents will get comments regular, text, and comment nodes var j = jQuery("#nonnodes").contents(); var d = jQuery("<div/>").appendTo("#nonnodes").append(j); |