From bd6dfe7d443efc51c3b8502b632ce2e2816424d8 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Fri, 24 May 2013 09:49:49 +0300 Subject: [PATCH] respect newlines for wall messages --- app/assets/javascripts/main.js.coffee | 3 +++ app/assets/javascripts/wall.js.coffee | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/main.js.coffee b/app/assets/javascripts/main.js.coffee index 45ef44f..65005d6 100644 --- a/app/assets/javascripts/main.js.coffee +++ b/app/assets/javascripts/main.js.coffee @@ -41,6 +41,9 @@ window.linkify = (str) -> exp = /(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/ig return str.replace(exp,"$1") +window.simpleFormat = (str) -> + linkify(sanitize(str).replace(/\n/g, '
')) + window.startSpinner = -> $('.turbolink-spinner').fadeIn() diff --git a/app/assets/javascripts/wall.js.coffee b/app/assets/javascripts/wall.js.coffee index 9f8f629..4f71e6e 100644 --- a/app/assets/javascripts/wall.js.coffee +++ b/app/assets/javascripts/wall.js.coffee @@ -61,7 +61,7 @@ class Wall template = @noteTemplate() template = template.replace('{{author_name}}', note.author.name) template = template.replace(/{{created_at}}/g, note.created_at) - template = template.replace('{{text}}', linkify(sanitize(note.body))) + template = template.replace('{{text}}', simpleFormat(note.body)) if note.attachment file = '' + note.attachment + '' -- libgit2 0.21.2