library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-11-23 02:54:22 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Revert "Fix #12120. Always stack .before/.after, and fix disconnected nodes."

Browse Source 
This reverts commit e2eac3f4d2.

There is a 1.7 regression with isDisconnected() that we should fix before tackling this.
This commit is contained in:
Dave Methvin 2012-08-24 11:57:48 -04:00
parent e2eac3f4d2
commit a5be986206
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/manipulation.js
View File

@ -148,7 +148,10 @@ jQuery.fn.extend({
}); });
} }
return this.pushStack( jQuery.merge( jQuery.clean( arguments ), this ), "before", this.selector ); if ( arguments.length ) {
var set = jQuery.clean( arguments );
return this.pushStack( jQuery.merge( set, this ), "before", this.selector );
}
}, },
after: function() { after: function() {
@ -158,7 +161,10 @@ jQuery.fn.extend({
}); });
} }
return this.pushStack( jQuery.merge( this.toArray(), jQuery.clean( arguments ) ), "after", this.selector ); if ( arguments.length ) {
var set = jQuery.clean( arguments );
return this.pushStack( jQuery.merge( this, set ), "after", this.selector );
}
}, },
// keepData is for internal use only--do not document // keepData is for internal use only--do not document
@ -715,7 +721,6 @@ jQuery.extend({
// Fix #11356: Clear elements from safeFragment // Fix #11356: Clear elements from safeFragment
if ( div ) { if ( div ) {
div.innerHTML = "";
safe.removeChild( div ); safe.removeChild( div );
elem = div = safe = null; elem = div = safe = null;
} }

11
test/unit/manipulation.js
View File

@ -909,13 +909,12 @@ test("before(Function)", function() {
testBefore(manipulationFunctionReturningObj); testBefore(manipulationFunctionReturningObj);
}); });
test("before and after w/ empty object (#10812, #12120)", function() { test("before and after w/ empty object (#10812)", function() {
expect(3); expect(2);
var res = jQuery("#notInTheDocument").before("<span>(</span>").after("<span>)</span>"); var res = jQuery( "#notInTheDocument" ).before( "(" ).after( ")" );
equal( res.length, 2, "added two elements to the empty object" ); equal( res.length, 2, "didn't choke on empty object" );
equal( res.text(), "()", "correctly appended text" ); equal( res.wrapAll("<div/>").parent().text(), "()", "correctly appended text" );
equal( res.end().text(), "(", "stacked the previous value" );
}); });
test("before and after on disconnected node (#10517)", function() { test("before and after on disconnected node (#10517)", function() {