r8039 보완. 필터 실행시점 오류 수정. GET_CONTENT 실행시 p 태그 래핑 제거

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@8044 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
taggon 2011-01-21 08:10:59 +00:00
parent 4b8bf1ea80
commit e4af93c9d0
2 changed files with 17 additions and 30 deletions

View file

@ -119,10 +119,13 @@ var inline_styled = {
// auto_br
var auto_br = {
'br2ln' : function(code) {
return $.trim(code.replace(/<br ?\/?>/ig, '\n'));
return code.replace(/<br ?\/?>/ig, '\n');
},
'ln2br' : function(code) {
return code.replace(/(^|[^>])\s*\r?\n\s*([^<])/g, '$1<br />$2');
return code.replace(/(>)?[ \t]*((?:\r?\n[ \t]*)+)[ \t]*(<)?/g, function(m0,m1,m2,m3){
if ( !m1 || !m3 ) m2 = m2.replace(/\r?\n/g, '<br />');
return (m1||'')+m2+(m3||'');
});
}
};