diff options
| author | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-06-19 08:06:25 -0700 |
|---|---|---|
| committer | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-06-19 08:06:25 -0700 |
| commit | c1740ffa2fcfcf663d8e847cfe03187fb600b6c1 (patch) | |
| tree | 1077544c0d976e274bdb5852fdf0ed548d6bd493 /web/react/utils/utils.jsx | |
| parent | 4f321383b33ab805f22e7172a54925b1cd353fcb (diff) | |
| parent | 8dab13c7ded5ca04e06b68146dbd8c34fb997763 (diff) | |
| download | chat-c1740ffa2fcfcf663d8e847cfe03187fb600b6c1.tar.gz chat-c1740ffa2fcfcf663d8e847cfe03187fb600b6c1.tar.bz2 chat-c1740ffa2fcfcf663d8e847cfe03187fb600b6c1.zip | |
Merge pull request #14 from mattermost/master
to me
Diffstat (limited to 'web/react/utils/utils.jsx')
| -rw-r--r-- | web/react/utils/utils.jsx | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx index e57088614..fb4f3a34e 100644 --- a/web/react/utils/utils.jsx +++ b/web/react/utils/utils.jsx @@ -366,9 +366,6 @@ module.exports.textToJsx = function(text, options) { if (options && options['singleline']) { var repRegex = new RegExp("\n", "g"); text = text.replace(repRegex, " "); - } else { - var repRegex = new RegExp("\n", "g"); - text = text.replace(repRegex, "<br>"); } var searchTerm = "" @@ -392,7 +389,7 @@ module.exports.textToJsx = function(text, options) { implicitKeywords[keywordArray[i]] = true; } - var lines = text.split("<br>"); + var lines = text.split("\n"); var urlMatcher = new LinkifyIt(); for (var i = 0; i < lines.length; i++) { var line = lines[i]; |