Merge commit '3f1db5a' into rav/roomview_works

pull/21833/head
Richard van der Hoff 2016-02-23 13:26:11 +00:00
commit 862e3c8c43
1 changed files with 7 additions and 9 deletions

View File

@ -146,19 +146,17 @@ class TextHighlighter extends BaseHighlighter {
* returns a React node * returns a React node
*/ */
_processSnippet(snippet, highlight) { _processSnippet(snippet, highlight) {
var spanProps = { var key = this._key++;
key: this._key++,
};
if (highlight) { var node =
spanProps.className = this.highlightClass; <span key={key} className={highlight ? this.highlightClass : null }>
} { snippet }
</span>;
var node = <span {...spanProps}>{ snippet }</span>;
if (highlight && this.highlightLink) { if (highlight && this.highlightLink) {
node = <a href={this.highlightLink}>{node}</a> node = <a key={key} href={this.highlightLink}>{node}</a>
} }
return node; return node;
} }
} }