mediawiki-diff-ins-del.patch
Public
Actions

Authored By

	• bzimport
	Nov 21 2014, 9:18 PM

Size

4 KB

Referenced Files

None

Subscribers

None

mediawiki-diff-ins-del.patch
View Options

	Index: skins/chick/main.css
	===================================================================
	--- skins/chick/main.css (revision 15879)
	+++ skins/chick/main.css (working copy)
	@@ -403,7 +403,8 @@
	background:#eeeeee;
	font-size: smaller;
	}
	-span.diffchange { color: red; }
	+ins.diffchange { color: red; text-decoration: none; }
	+del.diffchange { color: red; text-decoration: none; }

	a.external { color: #3366bb; }

	@@ -478,4 +479,4 @@

	#jump-to-nav {
	display: none;
	-}
	\ No newline at end of file
	+}
	Index: skins/monobook/main.css
	===================================================================
	--- skins/monobook/main.css (revision 15879)
	+++ skins/monobook/main.css (working copy)
	@@ -558,10 +558,16 @@
	background: #eee;
	font-size: smaller;
	}
	-span.diffchange {
	+ins.diffchange {
	color: red;
	font-weight: bold;
	+ text-decoration: none;
	}
	+del.diffchange {
	+ color: red;
	+ font-weight: bold;
	+ text-decoration: none;
	+}

	/*
	** keep the whitespace in front of the ^=, hides rule from konqueror
	Index: skins/common/common.css
	===================================================================
	--- skins/common/common.css (revision 15879)
	+++ skins/common/common.css (working copy)
	@@ -94,7 +94,16 @@
	background:#eeeeee;
	font-size: 94%;
	}
	-span.diffchange { color: red; font-weight: bold; }
	+ins.diffchange {
	+ color: red;
	+ font-weight: bold;
	+ text-decoration: none;
	+}
	+del.diffchange {
	+ color: red;
	+ font-weight: bold;
	+ text-decoration: none;
	+}

	img { border: none; }
	img.tex { vertical-align: middle; }
	@@ -383,4 +392,4 @@
	table.gallery td.galleryheader {
	text-align: center;
	font-weight: bold;
	-}
	\ No newline at end of file
	+}
	Index: skins/common/commonPrint.css
	===================================================================
	--- skins/common/commonPrint.css (revision 15879)
	+++ skins/common/commonPrint.css (working copy)
	@@ -284,5 +284,13 @@
	background:#eeeeee;
	font-size: smaller;
	}
	-span.diffchange { color: silver; font-weight: bold; text-decoration: underline; }
	-
	+ins.diffchange {
	+ color: silver;
	+ font-weight: bold;
	+ text-decoration: underline;
	+}
	+del.diffchange {
	+ color: silver;
	+ font-weight: bold;
	+ text-decoration: underline;
	+}
	Index: skins/simple/main.css
	===================================================================
	--- skins/simple/main.css (revision 15879)
	+++ skins/simple/main.css (working copy)
	@@ -242,7 +242,8 @@
	background-color: #f8ffaa;
	}

	-span.diffchange { background-color: #FFCDF3; }
	+ins.diffchange { background-color: #FFCDF3; text-decoration: none; }
	+del.diffchange { background-color: #FFCDF3; text-decoration: none; }
	.autocomment { color: grey; }
	#pagehistory span.user {
	margin-left: 1.4em;
	Index: includes/DifferenceEngine.php
	===================================================================
	--- includes/DifferenceEngine.php (revision 15879)
	+++ includes/DifferenceEngine.php (working copy)
	@@ -1525,9 +1525,12 @@

	function _flushGroup ($new_tag) {
	if ($this->_group !== '') {
	- if ($this->_tag == 'mark')
	- $this->_line .= '<span class="diffchange">' .
	- htmlspecialchars ( $this->_group ) . '</span>';
	+ if ($this->_tag == 'ins')
	+ $this->_line .= '<ins class="diffchange">' .
	+ htmlspecialchars ( $this->_group ) . '</ins>';
	+ elseif ($this->_tag == 'del')
	+ $this->_line .= '<del class="diffchange">' .
	+ htmlspecialchars ( $this->_group ) . '</del>';
	else
	$this->_line .= htmlspecialchars ( $this->_group );
	}
	@@ -1629,7 +1632,7 @@
	if ($edit->type == 'copy')
	$orig->addWords($edit->orig);
	elseif ($edit->orig)
	- $orig->addWords($edit->orig, 'mark');
	+ $orig->addWords($edit->orig, 'del');
	}
	$lines = $orig->getLines();
	wfProfileOut( $fname );
	@@ -1645,7 +1648,7 @@
	if ($edit->type == 'copy')
	$closing->addWords($edit->closing);
	elseif ($edit->closing)
	- $closing->addWords($edit->closing, 'mark');
	+ $closing->addWords($edit->closing, 'ins');
	}
	$lines = $closing->getLines();
	wfProfileOut( $fname );
	Index: includes/normal/RandomTest.php
	===================================================================
	--- includes/normal/RandomTest.php (revision 15879)
	+++ includes/normal/RandomTest.php (working copy)
	@@ -68,8 +68,8 @@
	$diffs = new Diff( $ota, $nta );
	$formatter = new TableDiffFormatter();
	$funky = $formatter->format( $diffs );
	- preg_match_all( '/<span class="diffchange">(.*?)<\/span>/', $funky, $matches );
	- foreach( $matches[1] as $bit ) {
	+ preg_match_all( '/<(ins\|del) class="diffchange">(.*?)<\/span>/', $funky, $matches );
	+ foreach( $matches[2] as $bit ) {
	$hex = bin2hex( $bit );
	echo "\t$hex\n";
	}

File Metadata

Mime Type: text/x-diff
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 2532
Default Alt Text: mediawiki-diff-ins-del.patch (4 KB)

mediawiki-diff-ins-del.patchPublicActions

mediawiki-diff-ins-del.patchView Options

File Metadata

Event Timeline

mediawiki-diff-ins-del.patch
Public
Actions

mediawiki-diff-ins-del.patch
View Options