Wrong diff text is shown after switching to "Unified"

[Jun Omae]

This issue is able to confirm at comment:description:ticket:12768.

@@ -810,11 +810,12 @@ and class Chrome(Component): should be shown in the same line but not. Also, the unified diff text is corrupted.

[Jun Omae]

I encountered this issue again. Notes that trunk only has the issue but 1.2-stable works fine.

[Jun Omae]

It is caused by that item.diffs_title are rendered with extra spaces in Jinja2 template at source:/trunk/trac/templates/diff_div.html@15484:182-187,310-315#L182​.

But item.diffs_title are rendered without extra spaces within an em element. We could easily retrieve text from the em element rather than the cell.

diff --git a/trac/htdocs/js/diff.js b/trac/htdocs/js/diff.js
index a54d72ee5..c27f0c95d 100644
--- a/trac/htdocs/js/diff.js
+++ b/trac/htdocs/js/diff.js
@@ -25,7 +25,7 @@
     var oldOffset = 0, oldLength = 0, newOffset = 0, newLength = 0;
     var title = "";
     if (inline)
-      title = $(ths[2]).text();
+      title = $('em', ths[2]).text();

     for (var i = 0; i < table.tBodies.length; i++) {
       var tBody = table.tBodies[i];
@@ -43,7 +43,7 @@
         oldOffset = 0, oldLength = 0, newOffset = 0, newLength = 0;
         if (tBody.className == "skipped") {
           if (inline)
-            title = $(tBody.rows[0].cells[2]).text();
+            title = $('em', tBody.rows[0].cells[2]).text();
           continue;
         }
       }

[Jun Omae]

Fixed in [16158].