Skip to content

Commit

Permalink
replaceWith() should return Bonzo(replced nodes)
Browse files Browse the repository at this point in the history
  • Loading branch information
@rvagg
rvagg committed Sep 3, 2012
1 parent 54373ea commit 945ad55
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 19 deletions.
3 changes: 2 additions & 1 deletion src/bonzo.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,8 @@
* @return {Bonzo}
*/
, replaceWith: function (node, opt_host) {
var ret = bonzo(normalize(node)).insertAfter(this, opt_host)
var ret = bonzo(this) // return replaced nodes
, rep = bonzo(normalize(node)).insertAfter(this, opt_host)
this.remove()
Bonzo.call(opt_host || this, ret)
return opt_host || this
Expand Down
50 changes: 33 additions & 17 deletions tests/dommanip_insertions.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ sink('DOM Manipulation - insertions', function(test, ok, before, after, assert)
}
, verifyReturnType = function (selector) {
return function () {
var el = $(selector), i
var el = selector ? $(selector) : this.expectedReturn, i
assert.equal(this.ret.length, el.length, 'correct number of elements in return value')
for (i = 0; i < el.length; i++)
ok(this.ret[i] === el[i], 'correct element #' + i + ' in return value')
Expand Down Expand Up @@ -193,10 +193,11 @@ sink('DOM Manipulation - insertions', function(test, ok, before, after, assert)
testName : 'single element $.create replaceWith'
, fixtureHTML : '<p id="insertiontasticFoo"></p><p id="insertiontasticReplace"></p>'
, execute : function () {
this.expectedReturn = $('#insertiontasticReplace')
this.ret = $('#insertiontasticReplace').replaceWith(this.single = createSingle())
}
, expectedTree : expectedTreeSingleToSingleAppended
, verify : [ verifySingleToSingleAppended, verifyReturnType('#insertiontastic > span.bam') ]
, verify : [ verifySingleToSingleAppended, verifyReturnType() ]
})

// html()
Expand Down Expand Up @@ -314,10 +315,11 @@ sink('DOM Manipulation - insertions', function(test, ok, before, after, assert)
testName : 'single createElement replaceWith'
, fixtureHTML : '<p id="insertiontasticFoo"></p><p id="insertiontasticReplace"></p>'
, execute : function () {
this.expectedReturn = $('#insertiontasticReplace')
this.ret = $('#insertiontasticReplace').replaceWith(this.single = createElementSingle())
}
, expectedTree : expectedTreeSingleToSingleAppended
, verify : [ verifySingleToSingleAppended, verifyReturnType('#insertiontastic > span.bam') ]
, verify : [ verifySingleToSingleAppended, verifyReturnType() ]
})

// html()
Expand Down Expand Up @@ -388,10 +390,11 @@ sink('DOM Manipulation - insertions', function(test, ok, before, after, assert)
testName : 'single element html string replaceWith'
, fixtureHTML : '<p id="insertiontasticFoo"></p><p id="insertiontasticReplace"></p>'
, execute : function () {
this.expectedReturn = $('#insertiontasticReplace')
this.ret = $('#insertiontasticReplace').replaceWith(htmlSingleStr)
}
, expectedTree : expectedTreeSingleToSingleAppended
, verify : verifyReturnType('#insertiontastic > span.bam')
, verify : verifyReturnType()
})

// html()
Expand Down Expand Up @@ -567,10 +570,11 @@ sink('DOM Manipulation - insertions', function(test, ok, before, after, assert)
, setup : setupSingleExistingElement
, fixtureHTML : '<p id="insertiontasticFoo"></p><p id="insertiontasticReplace"></p>'
, execute : function () {
this.expectedReturn = $('#insertiontasticReplace')
this.ret = $('#insertiontasticReplace').replaceWith(this.single = $('#insertiontasticSource > span'))
}
, expectedTree : expectedTreeSingleToSingleAppended
, verify : [ verifyExistingElementSourceEmpty, verifySingleToSingleAppended, verifyReturnType('#insertiontastic > span.bam') ]
, verify : [ verifyExistingElementSourceEmpty, verifySingleToSingleAppended, verifyReturnType() ]
})

// html()
Expand Down Expand Up @@ -718,10 +722,11 @@ sink('DOM Manipulation - insertions', function(test, ok, before, after, assert)
testName : 'multiple elements $.create replaceWith'
, fixtureHTML : '<p id="insertiontasticFoo"></p><p id="insertiontasticReplace"></p>'
, execute : function () {
this.expectedReturn = $('#insertiontasticReplace')
this.ret = $('#insertiontasticReplace').replaceWith(this.single = createMulti())
}
, expectedTree : expectedTreeMultiToSingleAppended
, verify : [ verifySingleToSingleAppended, verifyReturnType(multiSelector) ]
, verify : [ verifySingleToSingleAppended, verifyReturnType() ]
})

// html()
Expand Down Expand Up @@ -850,10 +855,11 @@ sink('DOM Manipulation - insertions', function(test, ok, before, after, assert)
testName : 'multiple elements createElement replaceWith'
, fixtureHTML : '<p id="insertiontasticFoo"></p><p id="insertiontasticReplace"></p>'
, execute : function () {
this.expectedReturn = $('#insertiontasticReplace')
this.ret = $('#insertiontasticReplace').replaceWith(this.single = createElementMulti())
}
, expectedTree : expectedTreeMultiToSingleAppended
, verify : [ verifySingleToSingleAppended, verifyReturnType(multiSelector) ]
, verify : [ verifySingleToSingleAppended, verifyReturnType() ]
})

// html()
Expand Down Expand Up @@ -921,10 +927,11 @@ sink('DOM Manipulation - insertions', function(test, ok, before, after, assert)
testName : 'multiple elements html string replaceWith'
, fixtureHTML : '<p id="insertiontasticFoo"></p><p id="insertiontasticReplace"></p>'
, execute : function () {
this.expectedReturn = $('#insertiontasticReplace')
this.ret = $('#insertiontasticReplace').replaceWith(htmlMultiStr)
}
, expectedTree : expectedTreeMultiToSingleAppended
, verify : verifyReturnType(multiSelector)
, verify : verifyReturnType()
})

// html()
Expand Down Expand Up @@ -1097,10 +1104,11 @@ sink('DOM Manipulation - insertions', function(test, ok, before, after, assert)
, fixtureHTML : '<p id="insertiontasticFoo"></p><p id="insertiontasticReplace"></p>'
, setup : setupMultiExistingElements
, execute : function () {
this.expectedReturn = $('#insertiontasticReplace')
this.ret = $('#insertiontasticReplace').replaceWith(this.single = $('#insertiontasticSource > *'))
}
, expectedTree : expectedTreeMultiToSingleAppended
, verify : [ verifyExistingElementSourceEmpty, verifySingleToSingleAppended, verifyReturnType(multiSelector) ]
, verify : [ verifyExistingElementSourceEmpty, verifySingleToSingleAppended, verifyReturnType() ]
})

// html()
Expand Down Expand Up @@ -1285,10 +1293,11 @@ sink('DOM Manipulation - insertions', function(test, ok, before, after, assert)
testName : 'single element $.create replaceWith to multiple targets'
, fixtureHTML : multiTargetReplaceWithFixtureHTML
, execute : function () {
this.expectedReturn = $('#insertiontastic > p > a')
this.ret = $('#insertiontastic > p > a').replaceWith(this.single = createSingle())
}
, expectedTree : expectedTreeSingleToMultiAppended
, verify : [ verifySingleToMultiAppended, verifyReturnType('#insertiontastic > p > .bam') ]
, verify : [ verifySingleToMultiAppended, verifyReturnType() ]
})

// html()
Expand Down Expand Up @@ -1400,10 +1409,11 @@ sink('DOM Manipulation - insertions', function(test, ok, before, after, assert)
testName : 'single element createElement() replaceWith to multiple targets'
, fixtureHTML : multiTargetReplaceWithFixtureHTML
, execute : function () {
this.expectedReturn = $('#insertiontastic > p > a')
this.ret = $('#insertiontastic > p > a').replaceWith(this.single = createElementSingle())
}
, expectedTree : expectedTreeSingleToMultiAppended
, verify : [ verifySingleToMultiAppended, verifyReturnType('#insertiontastic > p > .bam') ]
, verify : [ verifySingleToMultiAppended, verifyReturnType() ]
})

// html()
Expand Down Expand Up @@ -1471,10 +1481,11 @@ sink('DOM Manipulation - insertions', function(test, ok, before, after, assert)
testName : 'single element html string replaceWith to multiple targets'
, fixtureHTML : multiTargetReplaceWithFixtureHTML
, execute : function () {
this.expectedReturn = $('#insertiontastic > p > a')
this.ret = $('#insertiontastic > p > a').replaceWith(htmlSingleStr)
}
, expectedTree : expectedTreeSingleToMultiAppended
, verify : verifyReturnType('#insertiontastic > p > .bam')
, verify : verifyReturnType()
})

// html()
Expand Down Expand Up @@ -1643,10 +1654,11 @@ sink('DOM Manipulation - insertions', function(test, ok, before, after, assert)
, fixtureHTML : multiTargetReplaceWithFixtureHTML
, setup : setupSingleExistingElement
, execute : function () {
this.expectedReturn = $('#insertiontastic > p > a')
this.ret = $('#insertiontastic > p > a').replaceWith(this.single = $('#insertiontasticSource > span'))
}
, expectedTree : expectedTreeSingleToMultiAppended
, verify : [ verifyExistingElementSourceEmpty, verifySingleToMultiAppended, verifyReturnType('#insertiontastic > p > .bam') ]
, verify : [ verifyExistingElementSourceEmpty, verifySingleToMultiAppended, verifyReturnType() ]
})

// html()
Expand Down Expand Up @@ -1872,10 +1884,11 @@ sink('DOM Manipulation - insertions', function(test, ok, before, after, assert)
testName : 'multiple element $.create replaceWith to multiple targets'
, fixtureHTML : multiTargetReplaceWithFixtureHTML
, execute : function () {
this.expectedReturn = $('#insertiontastic > p > a')
this.ret = $('#insertiontastic > p > a').replaceWith(this.single = createMulti())
}
, expectedTree : expectedTreeMultiToMultiAppended
, verify : [ verifySingleToMultiAppended, verifyReturnType(multiSelector) ]
, verify : [ verifySingleToMultiAppended, verifyReturnType() ]
})

// html()
Expand Down Expand Up @@ -1987,10 +2000,11 @@ sink('DOM Manipulation - insertions', function(test, ok, before, after, assert)
testName : 'multiple element createElement() replaceWith to multiple targets'
, fixtureHTML : multiTargetReplaceWithFixtureHTML
, execute : function () {
this.expectedReturn = $('#insertiontastic > p > a')
this.ret = $('#insertiontastic > p > a').replaceWith(this.single = createElementMulti())
}
, expectedTree : expectedTreeMultiToMultiAppended
, verify : [ verifySingleToMultiAppended, verifyReturnType(multiSelector) ]
, verify : [ verifySingleToMultiAppended, verifyReturnType() ]
})

// html()
Expand Down Expand Up @@ -2058,10 +2072,11 @@ sink('DOM Manipulation - insertions', function(test, ok, before, after, assert)
testName : 'multiple elements html string replaceWith to multiple targets'
, fixtureHTML : multiTargetReplaceWithFixtureHTML
, execute : function () {
this.expectedReturn = $('#insertiontastic > p > a')
this.ret = $('#insertiontastic > p > a').replaceWith(htmlMultiStr)
}
, expectedTree : expectedTreeMultiToMultiAppended
, verify : verifyReturnType(multiSelector)
, verify : verifyReturnType()
})

// html()
Expand Down Expand Up @@ -2230,10 +2245,11 @@ sink('DOM Manipulation - insertions', function(test, ok, before, after, assert)
, fixtureHTML : multiTargetReplaceWithFixtureHTML
, setup : setupMultiExistingElements
, execute : function () {
this.expectedReturn = $('#insertiontastic > p > a')
this.ret = $('#insertiontastic > p > a').replaceWith(this.single = $('#insertiontasticSource > *'))
}
, expectedTree : expectedTreeMultiToMultiAppended
, verify : [ verifyExistingElementSourceEmpty, verifySingleToMultiAppended, verifyReturnType(multiSelector) ]
, verify : [ verifyExistingElementSourceEmpty, verifySingleToMultiAppended, verifyReturnType() ]
})

// html()
Expand Down
2 changes: 1 addition & 1 deletion tests/emptycollection.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ sink('Empty-collection safety', function (test, ok) {
, after: { str: 'html', args: ['<a/>'], expect: isSameContainer }
, insertBefore: { str: 'html', args: ['<a/>'], expect: isSameContainer }
, insertAfter: { str: 'html', args: ['<a/>'], expect: isSameContainer }
, replaceWith: { str: 'html', args: ['<a/>'], expect: isSameContainer }
, replaceWith: { str: 'html', args: ['<a/>'], expect: isEmptyContainer }
, css: [ { str: 'prop', args: ['color'], expect: isNull } // not sure about this one, depending on the browser you might get "" for an empty property on a real element and undefined for an unknown property on a real element
, { str: 'prop, val', args: ['color', 'red'], expect: isSameContainer }
, { str: '{prop: val}', args: [{color: 'red'}], expect: isSameContainer }
Expand Down

0 comments on commit 945ad55

Please sign in to comment.