From b8b92e6aaf3f303f9ef5e1fd34914e37738aee37 Mon Sep 17 00:00:00 2001 From: Pieter de Bie Date: Tue, 17 Jun 2008 15:58:17 +0200 Subject: [PATCH] PBWebGit: escape diff before inserting it into to the view We used to escape a diff only after it was formatted. This would cause some elements to hang the interface (like an iFrame) --- html/commit.js | 4 +++- html/diffHighlighter.js | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/html/commit.js b/html/commit.js index 22099f9..e8c8b18 100644 --- a/html/commit.js +++ b/html/commit.js @@ -34,7 +34,9 @@ var selectCommit = function(a) { var showDiffs = function() { $("details").hide(); - $("details").innerHTML = commit.diff; + + $("details").innerHTML = commit.diff.escapeHTML(); + highlightDiffs(); $("details").show(); } diff --git a/html/diffHighlighter.js b/html/diffHighlighter.js index bc22cb7..2f2f103 100644 --- a/html/diffHighlighter.js +++ b/html/diffHighlighter.js @@ -12,7 +12,7 @@ var highlightDiffs = function() { if (l.length > 100) l = l.substring(0, 100); - l = l.escapeHTML().gsub("\t", " "); + l = l.gsub("\t", " "); if (l.startsWith("+")) newContent += "
" + l + "
";