Fixed newline problems

deNULL · May 23, 2012 · 2440972 · 2440972
1 parent d77d167
commit 2440972
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/index.htm b/index.htm
@@ -119,7 +119,8 @@ <h4>Memory dump:</h4>
   $code = $_REQUEST['code'];
 }
 $code = htmlspecialchars($code);
-$code = str_replace(array(" ", "\n"), array("&nbsp;", "<br/>"), $code);
+$code = "<div>".str_replace(array(" ", "\n"), array("&nbsp;", "</div><div>"), $code)."</div>";
+$code = str_replace("<div></div>", "<div><br/></div>", $code);
 echo $code;?></div>
     </div>
   </div>

diff --git a/js/ui.js b/js/ui.js
@@ -192,7 +192,7 @@ function pad(v, w) {
 }
 
 function getText(e) {
-  return ge(e).innerHTML.replace(/\n/g, "").replace(/<(?:br|\/div|\/p)>/g, "\n").replace(/<.*?>/g, "").replace(/&nbsp;/g, " ");
+  return ge(e).innerHTML.replace(/\n/g, "").replace(/(?:<\/div><div>|<\/p><p>|<\/div>|(?!^)<div>|(?!^)<p>)/g, "\n").replace(/<.*?>/g, "").replace(/&nbsp;/g, " ");
 }
 function htmlEscape(s) {
   return s.split(" ").join("&nbsp;").split("<").join("&lt;");