IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #33 from mattermost/br-fix

Browse Source 
HELIUM fixes br tags causing new lines
This commit is contained in:
Corey Hulen
2015-06-18 23:08:01 -08:00
parent 423a862af9 0802c55aad
commit 0f106e5352
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web/react/components/create_post.jsx
View File

@@ -31,9 +31,7 @@ module.exports = React.createClass({
post.message = this.state.messageText;
var repRegex = new RegExp("<br>", "g");
if (post.message.replace(repRegex, " ").trim().length === 0
&& this.state.previews.length === 0) {
if (post.message.trim().length === 0 && this.state.previews.length === 0) {
return;
}

5
web/react/utils/utils.jsx
View File

@@ -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];