回复中的换行交给前端处理

xnathanh · May 7, 2015 · cb86d26 · cb86d26
1 parent d57d554
commit cb86d26
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/static/assets/js/post.js b/static/assets/js/post.js
@@ -169,6 +169,7 @@ $(document).ready(function(){
 		//666666
 		txt = txt.replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
 		txt = txt.replace(/@([a-zA-Z0-9_\-\u4e00-\u9fa5]+)/g, '<a href="/user/detail/$1">@$1</a>');
+		txt = txt.replace(/\n/g, "<br />");
 		$(this).html(txt);
 	});
 	(function(){

diff --git a/util/function.py b/util/function.py
@@ -147,7 +147,7 @@ def intval(str):
 
 def nl2br(str):
 	str = tornado.escape.xhtml_escape(str)
-	return str.replace("\n", "<br />")
+	return str
 
 def dump(obj):
 	'''return a printable representation of an object for debugging'''