Render max 2 newlines

e5c030c1 · JC Brand · 4361d0d6 · e5c030c1 · e5c030c1 · e5c030c1
Commit e5c030c1 authored Jun 30, 2018 by JC Brand
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

dist/converse.js dist/converse.js +1 -1

spec/messages.js spec/messages.js +1 -1

src/utils/core.js src/utils/core.js +1 -1

No files found.
--- a/dist/converse.js
+++ b/dist/converse.js
@@ -86946,7 +86946,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
  };

  u.renderNewLines = function (text) {
-    return text.replace(/\n+/g, '<br/>');
+    return text.replace(/\n\n+/g, '<br><br>').replace(/\n/g, '<br/>');
  };

  u.renderImageURLs = function (_converse, obj) {
--- a/spec/messages.js
+++ b/spec/messages.js
@@ -1091,7 +1091,7 @@
                "    <body>Hey\n\n\nHave you heard the news?</body>"+
                "</message>").firstChild;
            _converse.connection._dataRecv(test_utils.createRequest(stanza));
-            expect(chat_content.querySelector('.message:last-child .chat-msg-text').innerHTML).toBe('Hey<br>Have you heard the news?');
+            expect(chat_content.querySelector('.message:last-child .chat-msg-text').innerHTML).toBe('Hey<br><br>Have you heard the news?');

            stanza = Strophe.xmlHtmlNode(
                "<message from='"+contact_jid+"'"+

--- a/src/utils/core.js
+++ b/src/utils/core.js
@@ -223,7 +223,7 @@
    };

    u.renderNewLines = function (text) {
-        return text.replace(/\n+/g, '<br/>');
+        return text.replace(/\n\n+/g, '<br><br>').replace(/\n/g, '<br/>');
    };

    u.renderImageURLs = function (_converse, obj) {