Module:Demo - Revision history

BrandonXLF: Undid revision 1240199590 by BrandonXLF (talk)

2024-08-14T02:31:11Z

Undid revision 1240199590 by BrandonXLF (talk)

← Previous revision		Revision as of 02:31, 14 August 2024
Line 72:		Line 72:
	return args.reverse and		return args.reverse and
	show.output .. args.sep .. source or		show.output .. args.sep .. source or
	source ~~.. '\n'~~ .. args.sep .. show.output		source .. args.sep .. show.output
	end		end

BrandonXLF: Add a newline so the template can work with tables

2024-08-14T02:28:29Z

Add a newline so the template can work with tables

← Previous revision		Revision as of 02:28, 14 August 2024
Line 72:		Line 72:
	return args.reverse and		return args.reverse and
	show.output .. args.sep .. source or		show.output .. args.sep .. source or
	source .. args.sep .. show.output		source .. '\n' .. args.sep .. show.output
	end		end

CambridgeBayWeather: Changed protection settings for "Module:Demo" ([Edit=Require extended confirmed access] (indefinite) [Move=Require extended confirmed access] (indefinite))

2024-03-31T14:46:39Z

Changed protection settings for "Module:Demo" ([Edit=Require extended confirmed access] (indefinite) [Move=Require extended confirmed access] (indefinite))

← Previous revision	Revision as of 14:46, 31 March 2024
(No difference)

JWBTH: fix handling of -{

2023-08-09T09:12:21Z

fix handling of -{

← Previous revision		Revision as of 09:12, 9 August 2023
Line 42:		Line 42:
	-- outputting `}-` instead of `}-`, while it's ok with `<nowiki>} -</nowiki>`		-- outputting `}-` instead of `}-`, while it's ok with `<nowiki>} -</nowiki>`
	:gsub('}%-', '}-')		:gsub('}%-', '}-')
			-- The same with `-{`
			:gsub('%-{', '-{')
	end		end
	local kill_categories = frame.args.demo_kill_categories or frame.args.nocat		local kill_categories = frame.args.demo_kill_categories or frame.args.nocat

JWBTH: Update from Module:Demo/sandbox: Make HTML tags work, no extra
after code snippet by default, rename |br= to |sep= keeping old name, allow to flip code and result using |reverse=. See details (support for line-start markup is not here yet).

2023-08-06T05:31:48Z

Update from Module:Demo/sandbox: Make HTML tags work, no extra <br> after code snippet by default, rename |br= to |sep= keeping old name, allow to flip code and result using |reverse=. See details (support for line-start markup is not here yet).

← Previous revision		Revision as of 05:31, 6 August 2023
Line 22:		Line 22:
	end		end
	return orphan, parent		return orphan, parent
		⚫	end

			function getSeparator(args, default)
		⚫	local br = tonumber(args.br) and ('<br>'):rep(args.br) or args.br
			local sep = args.sep or br or default
			return #sep > 0 and ' ' .. sep .. ' ' or sep
	end		end

	function p.get(frame, arg, passArgs)		function p.get(frame, arg, passArgs)
	local orphan, frame = disinherit(frame, passArgs and {arg or 1})		local orphan, frame = disinherit(frame, passArgs and {arg or 1})
	local code~~, noWiki, preserve~~ = frame.args[arg or 1] or ''		local code = frame.args[arg or 1] or ''
	if code:match'nowiki' then		if code:match'UNIQ%-%-nowiki' then
	local placeholder, preserve = ('6'):char(), {}
	code = mw.text.unstripNoWiki(code)		code = mw.text.unstripNoWiki(code)
	~~noWiki = code:gsub('%%', placeholder)~~:gsub('<', '<~~'):gsub('>', '>~~')		:gsub('<', '<')
	~~for k in noWiki~~:~~gmatch~~('&.-;') do		:gsub('>', '>')
		⚫	:gsub('"', '"')
	if not preserve[k] then
			-- Replace `}%-` with `}-` because of some server quirk leading to
	preserve[k] = true
			-- =mw.text.unstripNoWiki(mw.getCurrentFrame():preprocess('<nowiki>}-</nowiki>'))
	table.insert(preserve, (k:gsub('&', '&')))
			-- outputting `}-` instead of `}-`, while it's ok with `<nowiki>} -</nowiki>`
⚫	~~noWiki = noWiki~~:gsub('(&.-;)', '~~%%%s~~')
			:gsub('}%-', '}-')
	end
⚫	end
	noWiki = mw.text.nowiki(noWiki):format(unpack(preserve)):gsub(placeholder, '%%')
	end		end
	local kill_categories = frame.args.demo_kill_categories or frame.args.nocat		local kill_categories = frame.args.demo_kill_categories or frame.args.nocat
	return {		return {
	source = ~~noWiki or~~ code,		source = code,
	output = orphan:preprocess(code):gsub(kill_categories and '%[%[Category.-%]%]' or '', ''),		output = orphan:preprocess(code):gsub(kill_categories and '%[%[Category.-%]%]' or '', ''),
	frame = frame		frame = frame
Line 51:		Line 54:
	local show = demoTable or p.get(frame)		local show = demoTable or p.get(frame)
	local args = show.frame.args		local args = show.frame.args
⚫	~~args.~~br = tonumber(args.br ~~or 1~~) and ('<br>'):rep(args.br ~~or 1~~) or args.br ~~or ''~~
	if show[args.result_arg] then		if show[args.result_arg] then
	return show[args.result_arg]		return show[args.result_arg]
	end		end
			local yesno = require('Module:Yesno')
⚫	~~return~~ frame:extensionTag{
			args.reverse = yesno(args.reverse, false)
			args.sep = getSeparator(args, '')
		⚫	local source = frame:extensionTag{
	name = 'syntaxhighlight',		name = 'syntaxhighlight',
	args = {		args = {
Line 61:		Line 66:
	style = args.style		style = args.style
	},		},
	content = ~~mw.text.decode(~~show.source)		content = show.source
			}
⚫	} .. args.br .. show.output
			return args.reverse and
			show.output .. args.sep .. source or
		⚫	source .. args.sep .. show.output
	end		end

Line 72:		Line 80:
	return show[args.result_arg]		return show[args.result_arg]
	end		end
			local yesno = require('Module:Yesno')
⚫	~~return~~ frame:extensionTag{
			args.reverse = yesno(args.reverse, false)
			args.sep = getSeparator(args, args.reverse and '←' or '→')
		⚫	local source = frame:extensionTag{
	name = 'syntaxhighlight',		name = 'syntaxhighlight',
	args = {		args = {
Line 79:		Line 90:
	style = args.style		style = args.style
	},		},
	content = ~~mw.text.decode(~~show.source)		content = show.source
			}
⚫	} .. ~~' → '~~ .. show.output
			return args.reverse and
			show.output .. args.sep .. source or
		⚫	source .. args.sep .. show.output
	end		end

Line 90:		Line 104:
	'demo_module_func',		'demo_module_func',
	'demo_main',		'demo_main',
			'demo_sep',
	'demo_br',		'demo_br',
	'demo_result_arg',		'demo_result_arg',
Line 98:		Line 113:
	local demoFunc = frame.args.demo_module_func or 'main\n'		local demoFunc = frame.args.demo_module_func or 'main\n'
	local demoModule = require('Module:' .. frame.args.demo_module)[demoFunc:match('^%s(.-)%s$')]		local demoModule = require('Module:' .. frame.args.demo_module)[demoFunc:match('^%s(.-)%s$')]
	frame.args.br, frame.args.result_arg = frame.args.demo_br, frame.args.demo_result_arg		frame.args.br, frame.args.result_arg = frame.args.demo_sep or frame.args.demo_br, frame.args.demo_result_arg
	local kill_categories = frame.args.demo_kill_categories or frame.args.nocat		local kill_categories = frame.args.demo_kill_categories or frame.args.nocat
	if demoModule then		if demoModule then
Line 124:		Line 139:
	table.insert(source, insertNamed, table.concat(named))		table.insert(source, insertNamed, table.concat(named))
	return p.main(orphan, {		return p.main(orphan, {
	source = ~~mw.text.encode(~~table.concat(source), "<>'\|=~"),		source = table.concat(source), "<>'\|=~",
	output = tostring(demoModule(orphan)):gsub(kill_categories and '%[%[Category.-%]%]' or '', ''),		output = tostring(demoModule(orphan)):gsub(kill_categories and '%[%[Category.-%]%]' or '', ''),
	frame = frame		frame = frame

Pppery: Per edit request

2023-07-22T21:09:09Z

Per edit request

@@ Line 55: / Line 55: @@
 		return show[args.result_arg]
 	end
 end
@@ Line 65: / Line 72: @@
 		return show[args.result_arg]
 	end
 end

CambridgeBayWeather: Protected "Module:Demo": Highly visible template ([Edit=Require template editor access] (indefinite) [Move=Require template editor access] (indefinite))

2019-01-02T19:54:11Z

Protected "Module:Demo": Highly visible template ([Edit=Require template editor access] (indefinite) [Move=Require template editor access] (indefinite))

← Previous revision	Revision as of 19:54, 2 January 2019
(No difference)

Andrybak: Enable parameter nocat in function get() + Refactor killing categories in function module().

2018-09-01T17:00:18Z

Enable parameter nocat in function get() + Refactor killing categories in function module().

← Previous revision		Revision as of 17:00, 1 September 2018
Line 40:		Line 40:
	noWiki = mw.text.nowiki(noWiki):format(unpack(preserve)):gsub(placeholder, '%%')		noWiki = mw.text.nowiki(noWiki):format(unpack(preserve)):gsub(placeholder, '%%')
	end		end
			local kill_categories = frame.args.demo_kill_categories or frame.args.nocat
	return {		return {
	source = noWiki or code,		source = noWiki or code,
	output = orphan:preprocess(code):gsub(~~frame.args.demo_kill_categories~~ and '%[%[Category.-%]%]' or '', ''),		output = orphan:preprocess(code):gsub(kill_categories and '%[%[Category.-%]%]' or '', ''),
	frame = frame		frame = frame
	}		}
Line 83:		Line 84:
	local demoModule = require('Module:' .. frame.args.demo_module)[demoFunc:match('^%s(.-)%s$')]		local demoModule = require('Module:' .. frame.args.demo_module)[demoFunc:match('^%s(.-)%s$')]
	frame.args.br, frame.args.result_arg = frame.args.demo_br, frame.args.demo_result_arg		frame.args.br, frame.args.result_arg = frame.args.demo_br, frame.args.demo_result_arg
	~~frame.args.demo_kill_categories~~ = frame.args.demo_kill_categories or frame.args.nocat		local kill_categories = frame.args.demo_kill_categories or frame.args.nocat
	if demoModule then		if demoModule then
	local named = {insert = function(self, ...) table.insert(self, ...) return self end}		local named = {insert = function(self, ...) table.insert(self, ...) return self end}
Line 109:		Line 110:
	return p.main(orphan, {		return p.main(orphan, {
	source = mw.text.encode(table.concat(source), "<>'\|=~"),		source = mw.text.encode(table.concat(source), "<>'\|=~"),
	output = tostring(demoModule(orphan)):gsub(~~frame.args.demo_kill_categories~~ and '%[%[Category.-%]%]' or '', ''),		output = tostring(demoModule(orphan)):gsub(kill_categories and '%[%[Category.-%]%]' or '', ''),
	frame = frame		frame = frame
	})		})

Andrybak: Add parameter "nocat" as alias to "demo_kill_categories".

2018-08-25T14:16:13Z

Add parameter "nocat" as alias to "demo_kill_categories".

← Previous revision		Revision as of 14:16, 25 August 2018
Line 76:		Line 76:
	'demo_br',		'demo_br',
	'demo_result_arg',		'demo_result_arg',
	'demo_kill_categories'		'demo_kill_categories',
			'nocat'
	})		})
	local template = frame.args.demo_template and 'Template:'..frame.args.demo_template		local template = frame.args.demo_template and 'Template:'..frame.args.demo_template
Line 82:		Line 83:
	local demoModule = require('Module:' .. frame.args.demo_module)[demoFunc:match('^%s(.-)%s$')]		local demoModule = require('Module:' .. frame.args.demo_module)[demoFunc:match('^%s(.-)%s$')]
	frame.args.br, frame.args.result_arg = frame.args.demo_br, frame.args.demo_result_arg		frame.args.br, frame.args.result_arg = frame.args.demo_br, frame.args.demo_result_arg
			frame.args.demo_kill_categories = frame.args.demo_kill_categories or frame.args.nocat
	if demoModule then		if demoModule then
	local named = {insert = function(self, ...) table.insert(self, ...) return self end}		local named = {insert = function(self, ...) table.insert(self, ...) return self end}

Swpb: +alternate function to return an inline result

2018-05-14T18:12:37Z

+alternate function to return an inline result

@@ Line 55: / Line 55: @@
 	end
 	return string.format('<pre%s>%s</pre>%s%s', args.style and string.format(" style='%s'", args.style) or '', show.source, args.br, show.output)
 end