Merge branch 'dispatch-target-1082'

afaden · Jun 16, 2014 · 21b131d · 21b131d
2 parents 846a738 + bfcefe7
commit 21b131d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/component/component_test.js b/component/component_test.js
@@ -1280,7 +1280,7 @@ steal("can/component", "can/view/stache", function () {
 		equal(frag.childNodes[0].innerHTML, '', 'child component is not inserted');
 		can.scope(frag.childNodes[0]).attr('shown', true);
 
-		equal(frag.childNodes[0].innerHTML, '<child-component>Hello world.</child-component>', 'child component is inserted');
+		equal(frag.childNodes[0].childNodes[0].innerHTML, 'Hello world.', 'child component is inserted');
 		can.scope(frag.childNodes[0]).attr('shown', false);
 
 		equal(frag.childNodes[0].innerHTML, '', 'child component is removed');

diff --git a/list/list.js b/list/list.js
@@ -286,7 +286,7 @@ steal("can/util", "can/map", "can/map/bubble.js",function (can, Map, bubble) {
 				// remove any items that were just added from the removed array
 				if(added.length && removed.length){
 					for (j = 0; j < removed.length; j++) {
-						if(added.indexOf(removed[j]) !== -1) {
+						if(can.inArray(added, removed[j]) !== -1) {
 							cleanRemoved.splice(j, 1);
 						}
 					}