r80621 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r80620‎ | r80621 | r80622 >
Date:09:53, 20 January 2011
Author:tstarling
Status:ok (Comments)
Tags:
Comment:
Fix for bug 25725: don't insert any whitespace inside the divs, so that "white-space: pre-wrap" can work.
Modified paths:
  • /trunk/extensions/wikidiff2/wikidiff2.cpp (modified) (history)

Diff [purge]

Index: trunk/extensions/wikidiff2/wikidiff2.cpp
——@@ -150,13 +150,13 @@
151151 // print twice; first for left side, then for right side
152152 result += "<tr>\n"
153153 " <td class=\"diff-marker\">-</td>\n"
154 - " <td class=\"diff-deletedline\"><div>\n";
 154+ " <td class=\"diff-deletedline\"><div>";
155155 printWordDiffSide(worddiff, false);
156 - result += "\n </div></td>\n"
 156+ result += "</div></td>\n"
157157 " <td class=\"diff-marker\">+</td>\n"
158 - " <td class=\"diff-addedline\"><div>\n";
 158+ " <td class=\"diff-addedline\"><div>";
159159 printWordDiffSide(worddiff, true);
160 - result += "\n </div></td>\n"
 160+ result += "</div></td>\n"
161161 "</tr>\n";
162162 }
163163

Follow-up revisions

RevisionCommit summaryAuthorDate
r806771.17: MFT r80109, r80113, r80223, r80475, r80554, r80575, r80620, r80621, r80...catrope03:12, 21 January 2011
r83886* Fixed bug 27993: in Wikidiff2::explodeWords(), the iterator pBrk is invalid...tstarling11:51, 14 March 2011

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r75769Avoid unnecessary linebreaks in difflines. Fixes bug 25725hartman00:14, 1 November 2010
r80620Revert r75769, r80475: mistaken attempt to fix bug 25725 by deleting random n...tstarling09:37, 20 January 2011

Comments

#Comment by Catrope (talk | contribs)   00:34, 21 January 2011

Tagging scaptrap as it requires recompiling wikidiff2 before the changes take effect.

#Comment by Tim Starling (talk | contribs)   07:26, 8 February 2011

It's not really much of a trap. The same could be said of anything that needs compiling.

Status & tagging log