Hello Legoktm, Tobias Gritschacher, Jkroll, jenkins-bot, MaxSem,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/392588
to review the following change.
Change subject: Revert "Add placeholder for title tags to the moved indicators"
......................................................................
Revert "Add placeholder for title tags to the moved indicators"
See discussion in T180602
This reverts commit 3dcda7efdd35c64ee31db47767f325d0ad2073da.
Change-Id: I0dfc947a627bc90fc905870c87b65b347d02b7b5
---
M TableDiff.cpp
M Wikidiff2.h
M tests/001.phpt
M tests/007.phpt
4 files changed, 14 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/php/wikidiff2
refs/changes/88/392588/1
diff --git a/TableDiff.cpp b/TableDiff.cpp
index 3914811..964f1c8 100644
--- a/TableDiff.cpp
+++ b/TableDiff.cpp
@@ -39,7 +39,7 @@
if (printLeft) {
result += " <td class=\"diff-marker\">";
if(dstAnchor != "")
- result += "<a class=\"mw-diff-movedpara-left\"
href=\"#" + dstAnchor + "\" data-title-tag=\"new\">⚫</a>";
+ result += "<a class=\"mw-diff-movedpara-left\"
href=\"#" + dstAnchor + "\">⚫</a>";
else
result += "−";
result += "</td>\n";
@@ -56,7 +56,7 @@
if (printRight) {
result += " <td class=\"diff-marker\">";
if(dstAnchor != "")
- result += "<a class=\"mw-diff-movedpara-right\"
href=\"#" + dstAnchor + "\" data-title-tag=\"old\">⚫</a>";
+ result += "<a class=\"mw-diff-movedpara-right\"
href=\"#" + dstAnchor + "\">⚫</a>";
else
result += "+";
result += "</td>\n";
diff --git a/Wikidiff2.h b/Wikidiff2.h
index 5ae1c76..909e084 100644
--- a/Wikidiff2.h
+++ b/Wikidiff2.h
@@ -16,7 +16,7 @@
#include <set>
#include <memory>
-#define WIKIDIFF2_VERSION_STRING "1.5.2"
+#define WIKIDIFF2_VERSION_STRING "1.5.1"
class Wikidiff2 {
public:
diff --git a/tests/001.phpt b/tests/001.phpt
index 96271bd..716d470 100644
--- a/tests/001.phpt
+++ b/tests/001.phpt
@@ -171,7 +171,7 @@
<td class="diff-context"><div>a</div></td>
</tr>
<tr>
- <td class="diff-marker"><a class="mw-diff-movedpara-left"
href="#movedpara_7_0_rhs" data-title-tag="new">⚫</a></td>
+ <td class="diff-marker"><a class="mw-diff-movedpara-left"
href="#movedpara_7_0_rhs">⚫</a></td>
<td class="diff-deletedline"><div><a
name="movedpara_5_0_lhs"></a>---line---</div></td>
<td colspan="2" class="diff-empty"> </td>
</tr>
@@ -205,7 +205,7 @@
</tr>
<tr>
<td colspan="2" class="diff-empty"> </td>
- <td class="diff-marker"><a class="mw-diff-movedpara-right"
href="#movedpara_5_0_lhs" data-title-tag="old">⚫</a></td>
+ <td class="diff-marker"><a class="mw-diff-movedpara-right"
href="#movedpara_5_0_lhs">⚫</a></td>
<td class="diff-addedline"><div><a
name="movedpara_7_0_rhs"></a>---line---</div></td>
</tr>
<tr>
@@ -237,12 +237,12 @@
<td class="diff-context"><div>a</div></td>
</tr>
<tr>
- <td class="diff-marker"><a class="mw-diff-movedpara-left"
href="#movedpara_11_0_rhs" data-title-tag="new">⚫</a></td>
+ <td class="diff-marker"><a class="mw-diff-movedpara-left"
href="#movedpara_11_0_rhs">⚫</a></td>
<td class="diff-deletedline"><div><a
name="movedpara_9_0_lhs"></a>--line1--</div></td>
<td colspan="2" class="diff-empty"> </td>
</tr>
<tr>
- <td class="diff-marker"><a class="mw-diff-movedpara-left"
href="#movedpara_11_1_rhs" data-title-tag="new">⚫</a></td>
+ <td class="diff-marker"><a class="mw-diff-movedpara-left"
href="#movedpara_11_1_rhs">⚫</a></td>
<td class="diff-deletedline"><div><a
name="movedpara_9_1_lhs"></a>--line2--</div></td>
<td colspan="2" class="diff-empty"> </td>
</tr>
@@ -276,12 +276,12 @@
</tr>
<tr>
<td colspan="2" class="diff-empty"> </td>
- <td class="diff-marker"><a class="mw-diff-movedpara-right"
href="#movedpara_9_0_lhs" data-title-tag="old">⚫</a></td>
+ <td class="diff-marker"><a class="mw-diff-movedpara-right"
href="#movedpara_9_0_lhs">⚫</a></td>
<td class="diff-addedline"><div><a
name="movedpara_11_0_rhs"></a>--line1--</div></td>
</tr>
<tr>
<td colspan="2" class="diff-empty"> </td>
- <td class="diff-marker"><a class="mw-diff-movedpara-right"
href="#movedpara_9_1_lhs" data-title-tag="old">⚫</a></td>
+ <td class="diff-marker"><a class="mw-diff-movedpara-right"
href="#movedpara_9_1_lhs">⚫</a></td>
<td class="diff-addedline"><div><a
name="movedpara_11_1_rhs"></a>--line2--</div></td>
</tr>
<tr>
@@ -395,4 +395,4 @@
<td class="diff-context"></td>
<td class="diff-marker"> </td>
<td class="diff-context"></td>
-</tr>
\ No newline at end of file
+</tr>
diff --git a/tests/007.phpt b/tests/007.phpt
index ecc8364..f37fe16 100644
--- a/tests/007.phpt
+++ b/tests/007.phpt
@@ -43,7 +43,7 @@
<td colspan="2" class="diff-lineno"><!--LINE 1--></td>
</tr>
<tr>
- <td class="diff-marker"><a class="mw-diff-movedpara-left"
href="#movedpara_6_1_rhs" data-title-tag="new">⚫</a></td>
+ <td class="diff-marker"><a class="mw-diff-movedpara-left"
href="#movedpara_6_1_rhs">⚫</a></td>
<td class="diff-deletedline"><div><a name="movedpara_0_0_lhs"></a>Substance,
in the truest<del class="diffchange diffchange-inline"> and primary</del> and
most definite sense of the word, is that which is neither predicable of a
subject nor present in a subject; for instance, the individual man or horse.
But in a secondary sense those things are called substances within which, as
species, the primary substances are included; also those which, as genera,
include the species. For instance, the individual man is included in the
species 'man', and the genus to which the species belongs is 'animal'; these,
therefore—that is to say, the species 'man' and the genus 'animal,-are termed
secondary substances.</div></td>
<td colspan="2" class="diff-empty"> </td>
</tr>
@@ -65,7 +65,7 @@
</tr>
<tr>
<td colspan="2" class="diff-empty"> </td>
- <td class="diff-marker"><a class="mw-diff-movedpara-right"
href="#movedpara_4_1_lhs" data-title-tag="old">⚫</a></td>
+ <td class="diff-marker"><a class="mw-diff-movedpara-right"
href="#movedpara_4_1_lhs">⚫</a></td>
<td class="diff-addedline"><div><a name="movedpara_2_1_rhs"></a>Everything
except primary substances is either predicable of a primary substance or
present in a primary substance. This becomes evident by reference to particular
instances which occur. 'Animal' is predicated of the species 'man', therefore
of the individual man, for if there were no individual man of whom it could be
predicated, it could not be predicated of the species 'man' at all. Again,
colour is present in body, therefore in individual bodies, for if there were no
individual body in which it was present, it could not be present in body at
all. Thus everything except primary substances is either predicated of primary
substances, or is present in them, and if these last did not exist, it would be
impossible for anything else to exist<ins class="diffchange
diffchange-inline">. Never underestimate lawns</ins>.</div></td>
</tr>
<tr>
@@ -86,7 +86,7 @@
<td colspan="2" class="diff-empty"> </td>
</tr>
<tr>
- <td class="diff-marker"><a class="mw-diff-movedpara-left"
href="#movedpara_2_1_rhs" data-title-tag="new">⚫</a></td>
+ <td class="diff-marker"><a class="mw-diff-movedpara-left"
href="#movedpara_2_1_rhs">⚫</a></td>
<td class="diff-deletedline"><div><a name="movedpara_4_1_lhs"></a>Everything
except primary substances is either predicable of a primary substance or
present in a primary substance. This becomes evident by reference to particular
instances which occur. 'Animal' is predicated of the species 'man', therefore
of the individual man, for if there were no individual man of whom it could be
predicated, it could not be predicated of the species 'man' at all. Again,
colour is present in body, therefore in individual bodies, for if there were no
individual body in which it was present, it could not be present in body at
all. Thus everything except primary substances is either predicated of primary
substances, or is present in them, and if these last did not exist, it would be
impossible for anything else to exist.</div></td>
<td colspan="2" class="diff-empty"> </td>
</tr>
@@ -109,6 +109,6 @@
</tr>
<tr>
<td colspan="2" class="diff-empty"> </td>
- <td class="diff-marker"><a class="mw-diff-movedpara-right"
href="#movedpara_0_0_lhs" data-title-tag="old">⚫</a></td>
+ <td class="diff-marker"><a class="mw-diff-movedpara-right"
href="#movedpara_0_0_lhs">⚫</a></td>
<td class="diff-addedline"><div><a name="movedpara_6_1_rhs"></a>Substance,
in the truest and most definite sense of the word, is that which is neither
predicable of a subject nor present in a subject; for instance, the individual
man or horse. But in a secondary sense those things are called substances
within which, as species, the primary substances are included; also those
which, as genera, include the species. For instance, the individual man is
included in the species 'man', and the genus to which the species belongs is
'animal'; these, therefore—that is to say, the species 'man' and the genus
'animal,-are termed secondary substances.</div></td>
</tr>
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/392588
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0dfc947a627bc90fc905870c87b65b347d02b7b5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/php/wikidiff2
Gerrit-Branch: master
Gerrit-Owner: WMDE-Fisch <christoph.jau...@wikimedia.de>
Gerrit-Reviewer: Jkroll <johannes.kr...@wikimedia.de>
Gerrit-Reviewer: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: MaxSem <maxsem.w...@gmail.com>
Gerrit-Reviewer: Tobias Gritschacher <tobias.gritschac...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
