fix(dom_renderer): moveNodeAfterSiblings should not detach the reference node

tbosch · tbosch · commit edcb34dc9f1f · 2015-12-10T20:14:27.000Z
Fixes angular#5077 Closes angular#5759
diff --git a/modules/angular2/src/platform/dom/dom_renderer.ts b/modules/angular2/src/platform/dom/dom_renderer.ts
@@ -365,11 +365,18 @@ function resolveInternalDomFragment(fragmentRef: RenderFragmentRef): Node[] {
 }
 
 function moveNodesAfterSibling(sibling, nodes) {
-  if (nodes.length > 0 && isPresent(DOM.parentElement(sibling))) {
-    for (var i = 0; i < nodes.length; i++) {
-      DOM.insertBefore(sibling, nodes[i]);
+  var parent = DOM.parentElement(sibling);
+  if (nodes.length > 0 && isPresent(parent)) {
+    var nextSibling = DOM.nextSibling(sibling);
+    if (isPresent(nextSibling)) {
+      for (var i = 0; i < nodes.length; i++) {
+        DOM.insertBefore(nextSibling, nodes[i]);
+      }
+    } else {
+      for (var i = 0; i < nodes.length; i++) {
+        DOM.appendChild(parent, nodes[i]);
+      }
     }
-    DOM.insertBefore(nodes[0], sibling);
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -365,11 +365,18 @@ function resolveInternalDomFragment(fragmentRef: RenderFragmentRef): Node[] {`
`365`	`365`	`}`
`366`	`366`
`367`	`367`	`function moveNodesAfterSibling(sibling, nodes) {`
`368`		`- if (nodes.length > 0 && isPresent(DOM.parentElement(sibling))) {`
`369`		`- for (var i = 0; i < nodes.length; i++) {`
`370`		`- DOM.insertBefore(sibling, nodes[i]);`
	`368`	`+ var parent = DOM.parentElement(sibling);`
	`369`	`+ if (nodes.length > 0 && isPresent(parent)) {`
	`370`	`+ var nextSibling = DOM.nextSibling(sibling);`
	`371`	`+ if (isPresent(nextSibling)) {`
	`372`	`+ for (var i = 0; i < nodes.length; i++) {`
	`373`	`+ DOM.insertBefore(nextSibling, nodes[i]);`
	`374`	`+ }`
	`375`	`+ } else {`
	`376`	`+ for (var i = 0; i < nodes.length; i++) {`
	`377`	`+ DOM.appendChild(parent, nodes[i]);`
	`378`	`+ }`
`371`	`379`	`}`
`372`		`- DOM.insertBefore(nodes[0], sibling);`
`373`	`380`	`}`
`374`	`381`	`}`
`375`	`382`