From e161afd5c0333c0bf728e5d0bfd67a081ff7d6da Mon Sep 17 00:00:00 2001 From: Doug Bell Date: Tue, 15 Sep 2009 14:37:03 -0500 Subject: [PATCH] fixed #10885: code editor breaks JS comments --- docs/changelog/7.x.x.txt | 1 + www/extras/yui-webgui/build/code-editor/code-editor.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 3833ca7dc..1b658c4e3 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -38,6 +38,7 @@ - fixed #10953: SendNewsletters Activity: Invalid template variable - fixed #10913: User profiles: Impossible to delete field contents - fixed #10929: EMS Ticket Start Date Sort + - fixed #10885: Code Editor breaks Javascript comments 7.7.19 - fixed #10838: Forwarded forum post email to new CS adds reply to original thread diff --git a/www/extras/yui-webgui/build/code-editor/code-editor.js b/www/extras/yui-webgui/build/code-editor/code-editor.js index 924dbd211..dba667acc 100755 --- a/www/extras/yui-webgui/build/code-editor/code-editor.js +++ b/www/extras/yui-webgui/build/code-editor/code-editor.js @@ -161,7 +161,7 @@ html = html.replace(/ ?
/gi,'\n'); html = html.replace(/<[^>]+>/g,''); // Remove spaces at end of lines - html = html.replace(/ +\r?\n/g,""); + html = html.replace(/ +(\r?)\n/g,"$1\n"); return html; };