paweld/pas2js
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/pas2js.git synced 2025-04-13 12:09:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Fix for escaping too much HTML, issue #39203

Browse Source
This commit is contained in:
Michael Van Canneyt 2021-12-21 14:32:57 +01:00
parent aadbe531b6
commit fb6cf854dd
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
packages/rtl/browserconsole.pas
View File

@ -99,6 +99,21 @@ begin
end;
Function EscapeString(S : String) : String;
Var
CL : string;
begin
cl:=StringReplace(S,'<','&lt;',[rfReplaceAll]);
cl:=StringReplace(cl,'>','&gt;',[rfReplaceAll]);
cl:=StringReplace(cl,' ','&nbsp;',[rfReplaceAll]);
cl:=StringReplace(cl,#13#10,'<br>',[rfReplaceAll]);
cl:=StringReplace(cl,#10,'<br>',[rfReplaceAll]);
cl:=StringReplace(cl,#13,'<br>',[rfReplaceAll]);
Result:=CL;
end;
Procedure WriteConsole(S : JSValue; NewLine : Boolean);
Var
@ -106,13 +121,7 @@ Var
begin
CL:=LastLine.InnerHtml;
CL:=CL+String(S);
cl:=StringReplace(cl,'<','&lt;',[rfReplaceAll]);
cl:=StringReplace(cl,'>','&gt;',[rfReplaceAll]);
cl:=StringReplace(cl,' ','&nbsp;',[rfReplaceAll]);
cl:=StringReplace(cl,#13#10,'<br>',[rfReplaceAll]);
cl:=StringReplace(cl,#10,'<br>',[rfReplaceAll]);
cl:=StringReplace(cl,#13,'<br>',[rfReplaceAll]);
CL:=CL+EscapeString(String(S));
LastLine.InnerHtml:=CL;
if NewLine then
begin