Skip to content

fix(dom_renderer): moveNodeAfterSiblings doesn't detach nodes. Fixes #5077 #5520

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mlynch wants to merge 2 commits into from
Closed

fix(dom_renderer): moveNodeAfterSiblings doesn't detach nodes. Fixes #5077 #5520

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f9c4b4
fix(dom_renderer): moveNodeAfterSiblings doesn't detach nodes. Fixes …
mlynch Dec 1, 2015
002290f
Cache parent node, use DOM facade
mlynch Dec 4, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions modules/angular2/src/platform/dom/dom_renderer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,11 +346,13 @@ function resolveInternalDomFragment(fragmentRef: RenderFragmentRef): Node[] {
}

function moveNodesAfterSibling(sibling, nodes) {
if (nodes.length > 0 && isPresent(DOM.parentElement(sibling))) {
let sib = sibling;
let parent = DOM.parentElement(sib);
if (nodes.length > 0 && isPresent(parent)) {
for (var i = 0; i < nodes.length; i++) {
DOM.insertBefore(sibling, nodes[i]);
parent.insertBefore(nodes[i], sib.nextSibling);

@tbosch tbosch Dec 4, 2015

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need to update sib and can't just always use sibling as the second argument?

@mlynch mlynch Dec 4, 2015

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well we need to make sure each node is appended after the one before it. I'd have to see what you're thinking exactly but my first thought is, keeping sibling.nextSibling fixed would mean the nodes get appended in reverse order.

@tbosch tbosch Dec 5, 2015

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Max, keeping sibling.nextSibling the same works / does not skrew up the order. Try this snippet:

function moveNodesAfterSibling(sibling, nodes) {
  var parent = sibling.parentElement;
  var nextSibling = sibling.nextSibling;
  for (var i = 0; i < nodes.length; i++) {
    parent.insertBefore(nodes[i], nextSibling);
  }    
}

var parent = document.createElement('div');
parent.innerHTML = '<script></script>';
var nodes = [document.createElement('div'), document.createElement('a'), document.createElement('b')];
moveNodesAfterSibling(parent.firstChild, nodes);
console.log(parent.innerHTML);

sib = nodes[i];
}
DOM.insertBefore(nodes[0], sibling);
}
}

Expand Down