r107883 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r107882‎ | r107883 | r107884 >
Date:13:18, 3 January 2012
Author:catrope
Status:ok (Comments)
Tags:
Comment:
(bug 26354) Add CSS class to dummy cells containing &nbsp; . Also change &nbsp; to &#160; . Applied patch by Erwin Dokter and updated tests. I've also retconned the changelog to make it look like this change was in 1.1.2-1 (created earlier today) all along, I hope that's OK.
Modified paths:
  • /trunk/extensions/wikidiff2/README (modified) (history)
  • /trunk/extensions/wikidiff2/debian/changelog (modified) (history)
  • /trunk/extensions/wikidiff2/tests/001.phpt (modified) (history)
  • /trunk/extensions/wikidiff2/tests/002.phpt (modified) (history)
  • /trunk/extensions/wikidiff2/wikidiff2.cpp (modified) (history)

Diff [purge]

Index: trunk/extensions/wikidiff2/wikidiff2.cpp
——@@ -119,7 +119,7 @@
120120 void Wikidiff2::printAdd(const String & line)
121121 {
122122 result += "<tr>\n"
123 - " <td colspan=\"2\">&nbsp;</td>\n"
 123+ " <td colspan=\"2\" class=\"diff-empty\">&#160;</td>\n"
124124 " <td class=\"diff-marker\">+</td>\n"
125125 " <td class=\"diff-addedline\">";
126126 printTextWithDiv(line);
——@@ -133,7 +133,7 @@
134134 " <td class=\"diff-deletedline\">";
135135 printTextWithDiv(line);
136136 result += "</td>\n"
137 - " <td colspan=\"2\">&nbsp;</td>\n"
 137+ " <td colspan=\"2\" class=\"diff-empty\">&#160;</td>\n"
138138 "</tr>\n";
139139 }
140140
Index: trunk/extensions/wikidiff2/debian/changelog
——@@ -1,7 +1,8 @@
22 php5-wikidiff2 (1.1.2-1) lucid; urgency=low
 3+ * Fixed bug 26354 (added class to dummy cells containing &nbsp;)
34 * Fixed bug 25697 (empty context lines not showing)
45
5 - -- Roan Kattouw <rkattouw@wikimedia.org> Tue, 03 Jan 2012 11:54:25 +0100
 6+ -- Roan Kattouw <rkattouw@wikimedia.org> Tue, 03 Jan 2012 14:15:41 +0100
67
78 php5-wikidiff2 (1.1.1-1) lucid; urgency=low
89
Index: trunk/extensions/wikidiff2/tests/001.phpt
——@@ -137,7 +137,7 @@
138138 <td class="diff-context"></td>
139139 </tr>
140140 <tr>
141 - <td colspan="2">&nbsp;</td>
 141+ <td colspan="2" class="diff-empty">&#160;</td>
142142 <td class="diff-marker">+</td>
143143 <td class="diff-addedline"><div>sjgfkdjfgb</div></td>
144144 </tr>
——@@ -156,7 +156,7 @@
157157 <tr>
158158 <td class="diff-marker">−</td>
159159 <td class="diff-deletedline"><div>kjahegwnygw</div></td>
160 - <td colspan="2">&nbsp;</td>
 160+ <td colspan="2" class="diff-empty">&#160;</td>
161161 </tr>
162162 <tr>
163163 <td class="diff-marker">&#160;</td>
——@@ -173,7 +173,7 @@
174174 <tr>
175175 <td class="diff-marker">−</td>
176176 <td class="diff-deletedline"><div>---line---</div></td>
177 - <td colspan="2">&nbsp;</td>
 177+ <td colspan="2" class="diff-empty">&#160;</td>
178178 </tr>
179179 <tr>
180180 <td class="diff-marker">&#160;</td>
——@@ -204,7 +204,7 @@
205205 <td class="diff-context"><div>a</div></td>
206206 </tr>
207207 <tr>
208 - <td colspan="2">&nbsp;</td>
 208+ <td colspan="2" class="diff-empty">&#160;</td>
209209 <td class="diff-marker">+</td>
210210 <td class="diff-addedline"><div>---line---</div></td>
211211 </tr>
——@@ -239,12 +239,12 @@
240240 <tr>
241241 <td class="diff-marker">−</td>
242242 <td class="diff-deletedline"><div>--line1--</div></td>
243 - <td colspan="2">&nbsp;</td>
 243+ <td colspan="2" class="diff-empty">&#160;</td>
244244 </tr>
245245 <tr>
246246 <td class="diff-marker">−</td>
247247 <td class="diff-deletedline"><div>--line2--</div></td>
248 - <td colspan="2">&nbsp;</td>
 248+ <td colspan="2" class="diff-empty">&#160;</td>
249249 </tr>
250250 <tr>
251251 <td class="diff-marker">&#160;</td>
——@@ -275,12 +275,12 @@
276276 <td class="diff-context"><div>a</div></td>
277277 </tr>
278278 <tr>
279 - <td colspan="2">&nbsp;</td>
 279+ <td colspan="2" class="diff-empty">&#160;</td>
280280 <td class="diff-marker">+</td>
281281 <td class="diff-addedline"><div>--line1--</div></td>
282282 </tr>
283283 <tr>
284 - <td colspan="2">&nbsp;</td>
 284+ <td colspan="2" class="diff-empty">&#160;</td>
285285 <td class="diff-marker">+</td>
286286 <td class="diff-addedline"><div>--line2--</div></td>
287287 </tr>
——@@ -315,7 +315,7 @@
316316 <tr>
317317 <td class="diff-marker">−</td>
318318 <td class="diff-deletedline"><div>x1</div></td>
319 - <td colspan="2">&nbsp;</td>
 319+ <td colspan="2" class="diff-empty">&#160;</td>
320320 </tr>
321321 <tr>
322322 <td class="diff-marker">&#160;</td>
——@@ -344,17 +344,17 @@
345345 <tr>
346346 <td class="diff-marker">−</td>
347347 <td class="diff-deletedline"><div>x2</div></td>
348 - <td colspan="2">&nbsp;</td>
 348+ <td colspan="2" class="diff-empty">&#160;</td>
349349 </tr>
350350 <tr>
351351 <td class="diff-marker">−</td>
352352 <td class="diff-deletedline"><div>x1</div></td>
353 - <td colspan="2">&nbsp;</td>
 353+ <td colspan="2" class="diff-empty">&#160;</td>
354354 </tr>
355355 <tr>
356356 <td class="diff-marker">−</td>
357357 <td class="diff-deletedline"><div>x2</div></td>
358 - <td colspan="2">&nbsp;</td>
 358+ <td colspan="2" class="diff-empty">&#160;</td>
359359 </tr>
360360 <tr>
361361 <td class="diff-marker">&#160;</td>
Index: trunk/extensions/wikidiff2/tests/002.phpt
——@@ -57,7 +57,7 @@
5858 <td class="diff-context"><div>== Shortest sequence in X ==</div></td>
5959 </tr>
6060 <tr>
61 - <td colspan="2">&nbsp;</td>
 61+ <td colspan="2" class="diff-empty">&#160;</td>
6262 <td class="diff-marker">+</td>
6363 <td class="diff-addedline"><div>x1</div></td>
6464 </tr>
——@@ -86,17 +86,17 @@
8787 <td class="diff-context"><div>x1</div></td>
8888 </tr>
8989 <tr>
90 - <td colspan="2">&nbsp;</td>
 90+ <td colspan="2" class="diff-empty">&#160;</td>
9191 <td class="diff-marker">+</td>
9292 <td class="diff-addedline"><div>x2</div></td>
9393 </tr>
9494 <tr>
95 - <td colspan="2">&nbsp;</td>
 95+ <td colspan="2" class="diff-empty">&#160;</td>
9696 <td class="diff-marker">+</td>
9797 <td class="diff-addedline"><div>x1</div></td>
9898 </tr>
9999 <tr>
100 - <td colspan="2">&nbsp;</td>
 100+ <td colspan="2" class="diff-empty">&#160;</td>
101101 <td class="diff-marker">+</td>
102102 <td class="diff-addedline"><div>x2</div></td>
103103 </tr>
Index: trunk/extensions/wikidiff2/README
——@@ -23,6 +23,7 @@
2424 == Changelog ==
2525
2626 2012-01-03
 27+* (bug 26354) Add class to dummy cells containing &nbsp;
2728 * (bug 25697) Add &#160; to empty context lines
2829
2930 2010-09-30

Sign-offs

UserFlagDate
Nikerabbitinspected20:22, 3 January 2012

Comments

#Comment by Reedy (talk | contribs)   17:40, 4 January 2012

Shouldn't you really be using a different changelog entry per commit?

#Comment by Catrope (talk | contribs)   19:59, 4 January 2012

Hence why I said:

I've also retconned the changelog to make it look like this change was in 1.1.2-1 (created earlier today) all along, I hope that's OK.

Status & tagging log