Home Explore Help
Register Sign In
im-changing.ru
/
converse.js
mirror of https://github.com/conversejs/converse.js.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Render max 2 newlines

JC Brand 7 years ago
parent
4361d0d66a
commit
e5c030c15a
3 changed files with 3 additions and 3 deletions
Split View Show Diff Stats
  1. 1 1
      dist/converse.js
  2. 1 1
      spec/messages.js
  3. 1 1
      src/utils/core.js

+ 1 - 1
dist/converse.js
View File 

@@ -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) {

+ 1 - 1
spec/messages.js
View File 

@@ -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+"'"+

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

@@ -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) {