Item15094: don't patch scripts from compare to diff by default

foswiki · Apr 28, 2022 · cda95d9 · cda95d9
1 parent 335c622
commit cda95d9
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 9 deletions.
diff --git a/data/System/DiffPlugin.txt b/data/System/DiffPlugin.txt
@@ -114,6 +114,7 @@ scripts with a call to =diff=.
 
 ---++ Change History
 %TABLE{columnwidths="7em" tablewidth="100%"}%
+|  28 Apr 2022 | don't patch scripts from compare, rdiff to diff by default for performance reasons |
 |  20 Oct 2020 | display dates _and_ time of changes; added support for Foswiki:Extensions/RevCommentPlugin |
 |  27 Nov 2019 | fixed js error in diff interface |
 |  12 Nov 2019 | improve ui diffing revisions; added option to exclude certain parts; log diff event | 
@@ -128,7 +129,7 @@ scripts with a call to =diff=.
 %META:FIELD{name="Release" title="Release" value="%25$RELEASE%25"}%
 %META:FIELD{name="Description" title="Description" value="%25$SHORTDESCRIPTION%25"}%
 %META:FIELD{name="Repository" title="Repository" value="https://github.com/foswiki/%25$ROOTMODULE%25"}%
-%META:FIELD{name="Copyright" title="Copyright" value="2016-2020 Michael Daum"}%
+%META:FIELD{name="Copyright" title="Copyright" value="2016-2022 Michael Daum"}%
 %META:FIELD{name="License" title="License" value="GPL ([[http://www.gnu.org/copyleft/gpl.html][GNU General Public License]])"}%
 %META:FIELD{name="Home" title="Home" value="https://foswiki.org/Extensions/%25$ROOTMODULE%25"}%
 %META:FIELD{name="Support" title="Support" value="https://foswiki.org/Support/%25$ROOTMODULE%25"}%

diff --git a/lib/Foswiki/Plugins/DiffPlugin.pm b/lib/Foswiki/Plugins/DiffPlugin.pm
@@ -1,6 +1,6 @@
 # Plugin for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 #
-# DiffPlugin is Copyright (C) 2016-2020 Michael Daum http://michaeldaumconsulting.com
+# DiffPlugin is Copyright (C) 2016-2022 Michael Daum http://michaeldaumconsulting.com
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -20,8 +20,8 @@ use warnings;
 
 use Foswiki::Func ();
 
-our $VERSION = '3.10';
-our $RELEASE = '20 Oct 2020';
+our $VERSION = '3.11';
+our $RELEASE = '28 Apr 2022';
 our $SHORTDESCRIPTION = 'Compare difference between topics and revisions';
 our $NO_PREFS_IN_TOPIC = 1;
 our $core;

diff --git a/lib/Foswiki/Plugins/DiffPlugin/Config.spec b/lib/Foswiki/Plugins/DiffPlugin/Config.spec
@@ -12,6 +12,6 @@ $Foswiki::cfg{SwitchBoard}{diff} = {
 
 # **BOOLEAN**
 # Replace calls to the <code>rdiff</code> and <code>compare</code> scripts with <code>diff</code> 
-$Foswiki::cfg{DiffPlugin}{PatchDiffScript} = 1;
+$Foswiki::cfg{DiffPlugin}{PatchDiffScript} = 0;
 
 1;
diff --git a/lib/Foswiki/Plugins/DiffPlugin/Core.pm b/lib/Foswiki/Plugins/DiffPlugin/Core.pm
@@ -1,6 +1,6 @@
 # Plugin for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 #
-# DiffPlugin is Copyright (C) 2016-2020 Michael Daum http://michaeldaumconsulting.com
+# DiffPlugin is Copyright (C) 2016-2022 Michael Daum http://michaeldaumconsulting.com
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License

diff --git a/locale/DiffPlugin/it.po b/locale/DiffPlugin/it.po
@@ -873,7 +873,7 @@ msgstr "Mostra la versione"
 #~ "password)"
 
 #~ msgid "Cancel"
-#~ msgstr "Rinuncia"
+#~ msgstr "Annullare"
 
 #~ msgid "Cancel editing and discard changes"
 #~ msgstr "Annulla le modifiche e rinuncia ai cambiamenti"

diff --git a/pub/System/DiffPlugin/diff.uncompressed.css b/pub/System/DiffPlugin/diff.uncompressed.css
@@ -27,7 +27,7 @@
 }
 
 .foswikiDiffControl a:hover {
-  background-color:#2375c5;
+  background-color: var(--color-hover-background, #2375c5);
 }
 .foswikiDiffControl a.disabled:hover {
   background-color:transparent;
@@ -60,6 +60,10 @@
   padding:0;
   margin:0;
   border:0;
+  color:#333;
+}
+.foswikiDiffContainer .unchanged pre {
+  color: var(--color-foreground, #333);
 }
 
 .foswikiDiffContainer .old,
@@ -69,7 +73,7 @@
 
 .foswikiDiffContainer td.old,
 .foswikiDiffContainer td.new {
-  background-color:#f5f5f5;
+  background-color: var(--alt-background, #f5f5f5);
 }
 
 .foswikiDiffContainer .index {
@@ -85,6 +89,10 @@
   text-decoration: none;
 }
 
+.foswikiDiffContainer b {
+  color: var(--color-h2, inherit);
+}
+
 .foswikiDiffContainer .changed .old { background-color:#FCEBED; }
 .foswikiDiffContainer .changed .old del { background-color:#FFD3D8; }
 .foswikiDiffContainer .changed .new { background-color:#CCF7CC; }