Skip to content
Permalink
Browse files

Merge branch 'master' of git://github.com/jquery/jquery

  • Loading branch information
jaubourg
jaubourg committed Dec 6, 2009
2 parents c600e66 + abbd2f4 commit 563779d833ece1369b6726fc39b307b8021df768
Showing with 7 additions and 4 deletions.
  1. +1 −1 src/core.js
  2. +3 −2 src/manipulation.js
  3. +3 −1 test/unit/manipulation.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>)?$/,
@@ -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];
@@ -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);

0 comments on commit 563779d

Please sign in to comment.
You can’t perform that action at this time.