Merge branch 'master' of git@github.com:jquery/jquery
This commit is contained in:
commit
1fe9ff5482
3 changed files with 7 additions and 4 deletions
|
@ -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];
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue