Merge pull request #1572 from matrix-org/dbkr/fix_multiple_pills

Fix multiple pills on one line
This commit is contained in:
David Baker 2017-11-03 14:24:33 +00:00 committed by GitHub
commit 2c9a93a8ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -194,6 +194,9 @@ module.exports = React.createClass({
node.parentNode.replaceChild(pillContainer, node); node.parentNode.replaceChild(pillContainer, node);
// Pills within pills aren't going to go well, so move on // Pills within pills aren't going to go well, so move on
pillified = true; pillified = true;
// update the current node with one that's now taken its place
node = pillContainer;
} }
} else if (node.nodeType == Node.TEXT_NODE) { } else if (node.nodeType == Node.TEXT_NODE) {
const Pill = sdk.getComponent('elements.Pill'); const Pill = sdk.getComponent('elements.Pill');