git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make sure that Opera fires events after an aborted Ajax attempt. Fixes #5787.
[jquery.git]
/
src
/
manipulation.js
diff --git
a/src/manipulation.js
b/src/manipulation.js
index
081bb54
..
742ec25
100644
(file)
--- a/
src/manipulation.js
+++ b/
src/manipulation.js
@@
-77,7
+77,14
@@
jQuery.fn.extend({
wrapInner: function( html ) {
return this.each(function() {
wrapInner: function( html ) {
return this.each(function() {
- jQuery( this ).contents().wrapAll( html );
+ var self = jQuery( this ), contents = self.contents();
+
+ if ( contents.length ) {
+ contents.wrapAll( html );
+
+ } else {
+ self.append( html );
+ }
});
},
});
},
@@
-196,6
+203,14
@@
jQuery.fn.extend({
this.empty().append( value );
}
this.empty().append( value );
}
+ } else if ( jQuery.isFunction( value ) ) {
+ this.each(function(i){
+ var self = jQuery(this), old = self.html();
+ self.empty().append(function(){
+ return value.call( this, i, old );
+ });
+ });
+
} else {
this.empty().append( value );
}
} else {
this.empty().append( value );
}
@@
-205,6
+220,12
@@
jQuery.fn.extend({
replaceWith: function( value ) {
if ( this[0] && this[0].parentNode ) {
replaceWith: function( value ) {
if ( this[0] && this[0].parentNode ) {
+ // Make sure that the elements are removed from the DOM before they are inserted
+ // this can help fix replacing a parent with child elements
+ if ( !jQuery.isFunction( value ) ) {
+ value = jQuery( value ).detach();
+ }
+
return this.each(function() {
var next = this.nextSibling, parent = this.parentNode;
return this.each(function() {
var next = this.nextSibling, parent = this.parentNode;