Tweaked formatting of src/manipulation.js.
This commit is contained in:
parent
48e9a39995
commit
ec7fdf3723
1 changed files with 40 additions and 28 deletions
|
@ -1,16 +1,17 @@
|
||||||
jQuery.fn.extend({
|
jQuery.fn.extend({
|
||||||
text: function( text ) {
|
text: function( text ) {
|
||||||
if ( typeof text !== "object" && text != null )
|
if ( typeof text !== "object" && text !== undefined )
|
||||||
return this.empty().append( (this[0] && this[0].ownerDocument || document).createTextNode( text ) );
|
return this.empty().append( (this[0] && this[0].ownerDocument || document).createTextNode( text ) );
|
||||||
|
|
||||||
var ret = "";
|
var ret = "";
|
||||||
|
|
||||||
jQuery.each( text || this, function(){
|
jQuery.each( text || this, function(){
|
||||||
jQuery.each( this.childNodes, function(){
|
jQuery.each( this.childNodes, function(){
|
||||||
if ( this.nodeType != 8 )
|
if ( this.nodeType !== 8 ) {
|
||||||
ret += this.nodeType != 1 ?
|
ret += this.nodeType !== 1 ?
|
||||||
this.nodeValue :
|
this.nodeValue :
|
||||||
jQuery.fn.text( [ this ] );
|
jQuery.fn.text( [ this ] );
|
||||||
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -19,21 +20,25 @@ jQuery.fn.extend({
|
||||||
|
|
||||||
wrapAll: function( html ) {
|
wrapAll: function( html ) {
|
||||||
if ( jQuery.isFunction( html ) ) {
|
if ( jQuery.isFunction( html ) ) {
|
||||||
return this.each(function() { jQuery(this).wrapAll(html.call(this)); });
|
return this.each(function() {
|
||||||
|
jQuery(this).wrapAll( html.apply(this, arguments) );
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( this[0] ) {
|
if ( this[0] ) {
|
||||||
// The elements to wrap the target around
|
// The elements to wrap the target around
|
||||||
var wrap = jQuery( html, this[0].ownerDocument ).eq(0).clone();
|
var wrap = jQuery( html, this[0].ownerDocument ).eq(0).clone();
|
||||||
|
|
||||||
if ( this[0].parentNode )
|
if ( this[0].parentNode ) {
|
||||||
wrap.insertBefore( this[0] );
|
wrap.insertBefore( this[0] );
|
||||||
|
}
|
||||||
|
|
||||||
wrap.map(function(){
|
wrap.map(function(){
|
||||||
var elem = this;
|
var elem = this;
|
||||||
|
|
||||||
while ( elem.firstChild && elem.firstChild.nodeType === 1 )
|
while ( elem.firstChild && elem.firstChild.nodeType === 1 ) {
|
||||||
elem = elem.firstChild;
|
elem = elem.firstChild;
|
||||||
|
}
|
||||||
|
|
||||||
return elem;
|
return elem;
|
||||||
}).append(this);
|
}).append(this);
|
||||||
|
@ -56,15 +61,17 @@ jQuery.fn.extend({
|
||||||
|
|
||||||
append: function() {
|
append: function() {
|
||||||
return this.domManip(arguments, true, function(elem){
|
return this.domManip(arguments, true, function(elem){
|
||||||
if (this.nodeType == 1)
|
if ( this.nodeType === 1 ) {
|
||||||
this.appendChild( elem );
|
this.appendChild( elem );
|
||||||
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
prepend: function() {
|
prepend: function() {
|
||||||
return this.domManip(arguments, true, function(elem){
|
return this.domManip(arguments, true, function(elem){
|
||||||
if (this.nodeType == 1)
|
if ( this.nodeType === 1 ) {
|
||||||
this.insertBefore( elem, this.firstChild );
|
this.insertBefore( elem, this.firstChild );
|
||||||
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -109,8 +116,7 @@ jQuery.fn.extend({
|
||||||
var orig = this.find("*").andSelf(), i = 0;
|
var orig = this.find("*").andSelf(), i = 0;
|
||||||
|
|
||||||
ret.find("*").andSelf().each(function(){
|
ret.find("*").andSelf().each(function(){
|
||||||
if ( this.nodeName !== orig[i].nodeName )
|
if ( this.nodeName !== orig[i].nodeName ) { return; }
|
||||||
return;
|
|
||||||
|
|
||||||
var events = jQuery.data( orig[i], "events" );
|
var events = jQuery.data( orig[i], "events" );
|
||||||
|
|
||||||
|
@ -141,8 +147,8 @@ jQuery.fn.extend({
|
||||||
},
|
},
|
||||||
|
|
||||||
domManip: function( args, table, callback ) {
|
domManip: function( args, table, callback ) {
|
||||||
var fragment, scripts, cacheable, cached, cacheresults, first;
|
var fragment, scripts, cacheable, cached, cacheresults, first,
|
||||||
var value = args[0];
|
value = args[0];
|
||||||
|
|
||||||
if ( jQuery.isFunction(value) ) {
|
if ( jQuery.isFunction(value) ) {
|
||||||
return this.each(function() {
|
return this.each(function() {
|
||||||
|
@ -262,8 +268,9 @@ jQuery.extend({
|
||||||
context = context || document;
|
context = context || document;
|
||||||
|
|
||||||
// !context.createElement fails in IE with an error but returns typeof 'object'
|
// !context.createElement fails in IE with an error but returns typeof 'object'
|
||||||
if ( typeof context.createElement === "undefined" )
|
if ( typeof context.createElement === "undefined" ) {
|
||||||
context = context.ownerDocument || context[0] && context[0].ownerDocument || document;
|
context = context.ownerDocument || context[0] && context[0].ownerDocument || document;
|
||||||
|
}
|
||||||
|
|
||||||
// If a single string is passed in and it's a single tag
|
// If a single string is passed in and it's a single tag
|
||||||
// just do a createElement and skip the rest
|
// just do a createElement and skip the rest
|
||||||
|
@ -276,11 +283,11 @@ jQuery.extend({
|
||||||
var ret = [], scripts = [], div = context.createElement("div");
|
var ret = [], scripts = [], div = context.createElement("div");
|
||||||
|
|
||||||
jQuery.each(elems, function(i, elem){
|
jQuery.each(elems, function(i, elem){
|
||||||
if ( typeof elem === "number" )
|
if ( typeof elem === "number" ) {
|
||||||
elem += '';
|
elem += '';
|
||||||
|
}
|
||||||
|
|
||||||
if ( !elem )
|
if ( !elem ) { return; }
|
||||||
return;
|
|
||||||
|
|
||||||
// Convert html string into DOM nodes
|
// Convert html string into DOM nodes
|
||||||
if ( typeof elem === "string" ) {
|
if ( typeof elem === "string" ) {
|
||||||
|
@ -325,8 +332,9 @@ jQuery.extend({
|
||||||
div.innerHTML = wrap[1] + elem + wrap[2];
|
div.innerHTML = wrap[1] + elem + wrap[2];
|
||||||
|
|
||||||
// Move to the right depth
|
// Move to the right depth
|
||||||
while ( wrap[0]-- )
|
while ( wrap[0]-- ) {
|
||||||
div = div.lastChild;
|
div = div.lastChild;
|
||||||
|
}
|
||||||
|
|
||||||
// Remove IE's autoinserted <tbody> from table fragments
|
// Remove IE's autoinserted <tbody> from table fragments
|
||||||
if ( !jQuery.support.tbody ) {
|
if ( !jQuery.support.tbody ) {
|
||||||
|
@ -341,23 +349,27 @@ jQuery.extend({
|
||||||
div.childNodes :
|
div.childNodes :
|
||||||
[];
|
[];
|
||||||
|
|
||||||
for ( var j = tbody.length - 1; j >= 0 ; --j )
|
for ( var j = tbody.length - 1; j >= 0 ; --j ) {
|
||||||
if ( jQuery.nodeName( tbody[ j ], "tbody" ) && !tbody[ j ].childNodes.length )
|
if ( jQuery.nodeName( tbody[ j ], "tbody" ) && !tbody[ j ].childNodes.length ) {
|
||||||
tbody[ j ].parentNode.removeChild( tbody[ j ] );
|
tbody[ j ].parentNode.removeChild( tbody[ j ] );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// IE completely kills leading whitespace when innerHTML is used
|
// IE completely kills leading whitespace when innerHTML is used
|
||||||
if ( !jQuery.support.leadingWhitespace && /^\s/.test( elem ) )
|
if ( !jQuery.support.leadingWhitespace && /^\s/.test( elem ) ) {
|
||||||
div.insertBefore( context.createTextNode( /^\s*/.exec(elem)[0] ), div.firstChild );
|
div.insertBefore( context.createTextNode( /^\s*/.exec(elem)[0] ), div.firstChild );
|
||||||
|
}
|
||||||
|
|
||||||
elem = jQuery.makeArray( div.childNodes );
|
elem = jQuery.makeArray( div.childNodes );
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( elem.nodeType )
|
if ( elem.nodeType ) {
|
||||||
ret.push( elem );
|
ret.push( elem );
|
||||||
else
|
} else {
|
||||||
ret = jQuery.merge( ret, elem );
|
ret = jQuery.merge( ret, elem );
|
||||||
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue