Module:Diff - Revision history

Jonesey95: Update from sandbox per talk page discussion. Functional changes are (1) encode all new line characters to avoid Linter misnesting errors when block content is wrapped, and (2) vertically align the diff blocks at the top of their respective table cells for easier comparison.

2024-11-17T04:20:25Z

Update from sandbox per talk page discussion. Functional changes are (1) encode all new line characters to avoid Linter misnesting errors when block content is wrapped, and (2) vertically align the diff blocks at the top of their respective table cells for easier comparison.

Show changes

Dabao qian: // Edit via Wikiplus

2024-08-06T11:32:15Z

// Edit via Wikiplus

← Previous revision		Revision as of 11:32, 6 August 2024
Line 240:		Line 240:
	deleted		deleted
	:tag('del')		:tag('del')
	:cssText('background: var(--background-color-content-removed,#ffe49c); ' .. insDelSharedStyle)		:cssText('background: var(--background-color-content-removed,#ffe49c); color: inherit; ' .. insDelSharedStyle)
	:addClass('diffchange')		:addClass('diffchange')
	:addClass('diffchange-inline')		:addClass('diffchange-inline')
Line 266:		Line 266:
	inserted		inserted
	:tag('ins')		:tag('ins')
	:cssText('background: var(--background-color-content-added,#a3d3ff); ' .. insDelSharedStyle)		:cssText('background: var(--background-color-content-added,#a3d3ff); color: inherit; ' .. insDelSharedStyle)
	:addClass('diffchange')		:addClass('diffchange')
	:addClass('diffchange-inline')		:addClass('diffchange-inline')

Dabao qian: // Edit via Wikiplus

2024-08-06T11:30:33Z

// Edit via Wikiplus

← Previous revision		Revision as of 11:30, 6 August 2024
Line 214:		Line 214:

	local tdSharedStyle = 'width: 48%; border-style: solid; border-radius: 0.33em; ' ..		local tdSharedStyle = 'width: 48%; border-style: solid; border-radius: 0.33em; ' ..
	'padding: 0.33em 0.5em; font-size: 1em; font-family: monospace; white-space: pre-wrap; border-width: 1px 1px 1px 4px; ' ..		'padding: 0.33em 0.5em; color: inherit; font-size: 1em; font-family: monospace; white-space: pre-wrap; border-width: 1px 1px 1px 4px; ' ..
	'-webkit-border-end-width: 1px; -webkit-border-start-width: 4px; ' ..		'-webkit-border-end-width: 1px; -webkit-border-start-width: 4px; ' ..
	'-moz-border-end-width: 1px; -moz-border-start-width: 4px;' -- these override default border-width for browsers that support them, needed for RTL UI on commons		'-moz-border-end-width: 1px; -moz-border-start-width: 4px;' -- these override default border-width for browsers that support them, needed for RTL UI on commons

Dabao qian: // Edit via Wikiplus

2024-08-06T11:23:39Z

// Edit via Wikiplus

← Previous revision		Revision as of 11:23, 6 August 2024
Line 229:		Line 229:
	local deleted = tr		local deleted = tr
	:tag('td')		:tag('td')
	:cssText('border-color: #ffe49c; ' .. tdSharedStyle)		:cssText('border-color: var(--background-color-content-removed,#ffe49c); ' .. tdSharedStyle)
	:addClass('diff-deletedline')		:addClass('diff-deletedline')
	:tag('div')		:tag('div')
Line 240:		Line 240:
	deleted		deleted
	:tag('del')		:tag('del')
	:cssText('background: #~~feeec8~~; ' .. insDelSharedStyle)		:cssText('background: var(--background-color-content-removed,#ffe49c); ' .. insDelSharedStyle)
	:addClass('diffchange')		:addClass('diffchange')
	:addClass('diffchange-inline')		:addClass('diffchange-inline')
Line 255:		Line 255:
	local inserted = tr		local inserted = tr
	:tag('td')		:tag('td')
	:cssText('border-color: #a3d3ff; ' .. tdSharedStyle)		:cssText('border-color: var(--background-color-content-added,#a3d3ff); ' .. tdSharedStyle)
	:addClass('diff-addedline')		:addClass('diff-addedline')
	:tag('div')		:tag('div')
Line 266:		Line 266:
	inserted		inserted
	:tag('ins')		:tag('ins')
	:cssText('background: #~~d8ecff~~; ' .. insDelSharedStyle)		:cssText('background: var(--background-color-content-added,#a3d3ff); ' .. insDelSharedStyle)
	:addClass('diffchange')		:addClass('diffchange')
	:addClass('diffchange-inline')		:addClass('diffchange-inline')

Aaron Liu: i have no idea what i'm doing, but this seems to fix characters being converted to HTML entities for no reason

2024-05-16T02:14:46Z

i have no idea what i'm doing, but this seems to fix characters being converted to HTML entities for no reason

← Previous revision		Revision as of 02:14, 16 May 2024
Line 279:		Line 279:

	local function main(frame)		local function main(frame)
	return wikiDiff(mw.text.~~unstrip~~(mw.text.~~decode~~(frame.args[1])), mw.text.decode(mw.text.unstrip(frame.args[2])), frame.args[3] or '[%s%.:-]+')		return wikiDiff(mw.text.decode(mw.text.unstrip(frame.args[1])), mw.text.decode(mw.text.unstrip(frame.args[2])), frame.args[3] or '[%s%.:-]+')
	end		end

Dinoguy1000: fix typos and other tweaks in comments

2024-05-08T00:31:22Z

fix typos and other tweaks in comments

MusikBot II: Protected "Module:Diff": High-risk template or module: 251 transclusions (more info) ([Edit=Require autoconfirmed or confirmed access] (indefinite))

2023-08-13T18:00:16Z

Protected "Module:Diff": High-risk template or module: 251 transclusions (more info) ([Edit=Require autoconfirmed or confirmed access] (indefinite))

← Previous revision	Revision as of 18:00, 13 August 2023
(No difference)

CactiStaccingCrane: format diff

2023-05-16T10:30:42Z

format diff

← Previous revision		Revision as of 10:30, 16 May 2023
Line 214:		Line 214:

	local tdSharedStyle = 'width: 48%; border-style: solid; border-radius: 0.33em; ' ..		local tdSharedStyle = 'width: 48%; border-style: solid; border-radius: 0.33em; ' ..
	'padding: 0.33em 0.5em; font-size: ~~88%~~; white-space: pre-wrap; border-width: 1px 1px 1px 4px; ' ..		'padding: 0.33em 0.5em; font-size: 1em; font-family: monospace; white-space: pre-wrap; border-width: 1px 1px 1px 4px; ' ..
	'-webkit-border-end-width: 1px; -webkit-border-start-width: 4px; ' ..		'-webkit-border-end-width: 1px; -webkit-border-start-width: 4px; ' ..
	'-moz-border-end-width: 1px; -moz-border-start-width: 4px;' -- these overrides default border-width for browsers supports them, needed for RTL UI on commons		'-moz-border-end-width: 1px; -moz-border-start-width: 4px;' -- these overrides default border-width for browsers supports them, needed for RTL UI on commons

Izno: make globals into locals

2022-10-26T03:46:09Z

make globals into locals

← Previous revision		Revision as of 03:46, 26 October 2022
Line 9:		Line 9:
	-----------------------------------------------------------------------------		-----------------------------------------------------------------------------

	SKIP_SEPARATOR = true -- a constant		local SKIP_SEPARATOR = true -- a constant

	~~IN = "in"; OUT = "out"; SAME = "same"~~ -- token statuses		-- token statuses
			local IN = "in"
			local OUT = "out"
			local SAME = "same"

	-----------------------------------------------------------------------------		-----------------------------------------------------------------------------
Line 23:		Line 26:
	-- @return A list of tokens.		-- @return A list of tokens.
	-----------------------------------------------------------------------------		-----------------------------------------------------------------------------
	function split(text, separator, skip_separator)		local function split(text, separator, skip_separator)
	separator = separator or "%s+"		separator = separator or "%s+"
	local parts = {}		local parts = {}
Line 53:		Line 56:
	-- @return the least common subsequence as a matrix.		-- @return the least common subsequence as a matrix.
	-----------------------------------------------------------------------------		-----------------------------------------------------------------------------
	function quick_LCS(t1, t2)		local function quick_LCS(t1, t2)
	local m = #t1		local m = #t1
	local n = #t2		local n = #t2
Line 98:		Line 101:
	-- @return an HTML string.		-- @return an HTML string.
	-----------------------------------------------------------------------------		-----------------------------------------------------------------------------
	function format_as_html(tokens)		local function format_as_html(tokens)
	local diff_buffer = ""		local diff_buffer = ""
	local token, status		local token, status
Line 125:		Line 128:
	-- @return A list of annotated tokens.		-- @return A list of annotated tokens.
	-----------------------------------------------------------------------------		-----------------------------------------------------------------------------
	function diff(old, new, separator)		local function diff(old, new, separator)
	assert(old); assert(new)		assert(old); assert(new)
	new = split(new, separator); old = split(old, separator)		new = split(new, separator); old = split(old, separator)
Line 200:		Line 203:
	-- Wiki diff style, currently just for a line		-- Wiki diff style, currently just for a line
	-----------------------------------------------------------------------------		-----------------------------------------------------------------------------
	function wikiDiff(old, new, separator)		local function wikiDiff(old, new, separator)
	local tokens = diff(old, new, separator)		local tokens = diff(old, new, separator)
	local root = mw.html.create('')		local root = mw.html.create('')
Line 275:		Line 278:
	end		end

	function main(frame)		local function main(frame)
	return wikiDiff(mw.text.unstrip(mw.text.decode(frame.args[1])), mw.text.decode(mw.text.unstrip(frame.args[2])), frame.args[3] or '[%s%.:-]+')		return wikiDiff(mw.text.unstrip(mw.text.decode(frame.args[1])), mw.text.decode(mw.text.unstrip(frame.args[2])), frame.args[3] or '[%s%.:-]+')
	end		end

Mxn: white-space: pre-wrap for code diffs

2014-11-01T06:58:57Z

white-space: pre-wrap for code diffs

← Previous revision		Revision as of 06:58, 1 November 2014
Line 211:		Line 211:

	local tdSharedStyle = 'width: 48%; border-style: solid; border-radius: 0.33em; ' ..		local tdSharedStyle = 'width: 48%; border-style: solid; border-radius: 0.33em; ' ..
	'padding: 0.33em 0.5em; font-size: 88%; border-width: 1px 1px 1px 4px; ' ..		'padding: 0.33em 0.5em; font-size: 88%; white-space: pre-wrap; border-width: 1px 1px 1px 4px; ' ..
	'-webkit-border-end-width: 1px; -webkit-border-start-width: 4px; ' ..		'-webkit-border-end-width: 1px; -webkit-border-start-width: 4px; ' ..
	'-moz-border-end-width: 1px; -moz-border-start-width: 4px;' -- these overrides default border-width for browsers supports them, needed for RTL UI on commons		'-moz-border-end-width: 1px; -moz-border-start-width: 4px;' -- these overrides default border-width for browsers supports them, needed for RTL UI on commons

← Previous revision		Revision as of 00:31, 8 May 2024
Line 22:		Line 22:
	-- @param text A string to be split.		-- @param text A string to be split.
	-- @param separator [optional] the separator pattern (defaults to any		-- @param separator [optional] the separator pattern (defaults to any
	-- ~~white space~~ - %s+).		-- whitespace - %s+).
	-- @param skip_separator [optional] don't include the ~~sepator~~ in the results.		-- @param skip_separator [optional] don't include the separator in the results.
	-- @return A list of tokens.		-- @return A list of tokens.
	-----------------------------------------------------------------------------		-----------------------------------------------------------------------------
Line 124:		Line 124:
	-- @param old The "old" text string		-- @param old The "old" text string
	-- @param new The "new" text string		-- @param new The "new" text string
	-- @param separator [optional] the separator pattern (defaults ot any		-- @param separator [optional] the separator pattern (defaults to any
	-- ~~white space~~).		-- whitespace).
	-- @return A list of annotated tokens.		-- @return A list of annotated tokens.
	-----------------------------------------------------------------------------		-----------------------------------------------------------------------------
Line 216:		Line 216:
	'padding: 0.33em 0.5em; font-size: 1em; font-family: monospace; white-space: pre-wrap; border-width: 1px 1px 1px 4px; ' ..		'padding: 0.33em 0.5em; font-size: 1em; font-family: monospace; white-space: pre-wrap; border-width: 1px 1px 1px 4px; ' ..
	'-webkit-border-end-width: 1px; -webkit-border-start-width: 4px; ' ..		'-webkit-border-end-width: 1px; -webkit-border-start-width: 4px; ' ..
	'-moz-border-end-width: 1px; -moz-border-start-width: 4px;' -- these ~~overrides~~ default border-width for browsers ~~supports~~ them, needed for RTL UI on commons		'-moz-border-end-width: 1px; -moz-border-start-width: 4px;' -- these override default border-width for browsers that support them, needed for RTL UI on commons
	local insDelSharedStyle = 'padding: 0.25em 0; font-weight: bold; text-decoration: initial;'		local insDelSharedStyle = 'padding: 0.25em 0; font-weight: bold; text-decoration: initial;'