Merge remote-tracking branch 'origin/develop' into develop

2017-11-03 14:24:37 +00:00 · 2017-11-03 14:24:37 +00:00 · ec8afd185f
commit ec8afd185f
parent 1cc65044d4 2c9a93a8ac
1 changed files with 3 additions and 0 deletions
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@ -194,6 +194,9 @@ module.exports = React.createClass({
                    node.parentNode.replaceChild(pillContainer, node);
                    // Pills within pills aren't going to go well, so move on
                    pillified = true;
+
+                    // update the current node with one that's now taken its place
+                    node = pillContainer;
                }
            } else if (node.nodeType == Node.TEXT_NODE) {
                const Pill = sdk.getComponent('elements.Pill');