Module:Jcon - Revision history

Jonesey95: fix text color in dark mode; this generally works but may cause problems, in which case revert or try specifying a different CSS value

2025-05-05T22:03:36Z

fix text color in dark mode; this generally works but may cause problems, in which case revert or try specifying a different CSS value

← Previous revision		Revision as of 22:03, 5 May 2025
Line 301:		Line 301:

	-- Add table		-- Add table
	local out = '<table style="~~background: transparent;~~ margin: 0; padding: 0; width: 100%; align: left;">'		local out = '<table style="margin: 0; padding: 0; width: 100%; align: left;">'

	-- Add a table row		-- Add a table row
Line 319:		Line 319:

	if routeShield ~= '' then		if routeShield ~= '' then
	out = out .. '<td style="~~background: transparent;~~ border: 0px; margin: 0px; padding: 0px;">' .. routeShield .. '</td>'		out = out .. '<td style="border: 0px; margin: 0px; padding: 0px;">' .. routeShield .. '</td>'
	end		end

Line 326:		Line 326:

	if routeText ~= '' then		if routeText ~= '' then
	out = out .. '<td style="~~background: transparent;~~ border: 0px; margin: 0px; padding: 0px; text-align: center;">' .. routeText .. '</td>'		out = out .. '<td style="border: 0px; margin: 0px; padding: 0px; text-align: center;">' .. routeText .. '</td>'
	end		end

BrandonXLF: Support multiple shields per route

2024-08-24T10:37:04Z

Support multiple shields per route

← Previous revision		Revision as of 10:37, 24 August 2024
Line 46:		Line 46:
	if to and shield then		if to and shield then
	local res = parser(parserArgs, 'shieldtomain', nil, dataModuleName)		local res = parser(parserArgs, 'shieldtomain', nil, dataModuleName)
⚫	if type(~~res~~) == 'table' then ~~return res[1] end~~
	if res then return res end		if res then return res end
	end		end
Line 53:		Line 52:
	if to then		if to then
	local res = parser(parserArgs, 'shieldto', nil, dataModuleName)		local res = parser(parserArgs, 'shieldto', nil, dataModuleName)
	if type(res) == 'table' then return res[1] end
	if res then return res end		if res then return res end
	end		end
Line 59:		Line 57:
	-- Shield format (used as reassurance marker)		-- Shield format (used as reassurance marker)
	if shield then		if shield then
	local res = parser(parserArgs, '~~shieldmain~~', nil, dataModuleName)		local res = parser(parserArgs, 'shieldlist', nil, dataModuleName)
	if type(res) == 'table' then return res[1] end
	if res then return res end		if res then return res end
	end		end
Line 66:		Line 63:
	-- Guide format (used on guide signs)		-- Guide format (used on guide signs)
	local res = parser(parserArgs, 'shield', nil, dataModuleName)		local res = parser(parserArgs, 'shield', nil, dataModuleName)
	if type(res) == 'table' then return res[1] end
	if res then return res end		if res then return res end

Line 74:		Line 70:
	-- Generate the wikitext for the shield		-- Generate the wikitext for the shield
	local function shieldWikitext(parserArgs, args, prefix)		local function shieldWikitext(parserArgs, args, prefix)
		⚫	local shield = getShield(parserArgs, yesno(args.shield), prefix == 'to')
⚫	return showFile(
		⚫
⚫	getShield(parserArgs, yesno(args.shield), prefix == 'to'),
		⚫	if type(shield) == 'table' then
	args
			local out = {}
⚫	)

			for i, single in ipairs(shield) do
			table.insert(out, showFile(single, args))
			end

			return table.concat(out, ' ') -- Add a space between multiple shields
			end

		⚫	return showFile(shield, args)
	end		end

BrandonXLF: Return nothing for shieldlist if type is not known

2024-08-24T09:53:44Z

Return nothing for shieldlist if type is not known

← Previous revision		Revision as of 09:53, 24 August 2024
Line 292:		Line 292:
	local route = args[2]		local route = args[2]
	local size = args.size or '36px'		local size = args.size or '36px'

			if not data[type] then return '' end

	-- Add table		-- Add table

BrandonXLF: Support new data format

2024-08-24T09:50:10Z

Support new data format

Show changes

BrandonXLF: Support shieldlist for Template:Shieldlist

2024-08-15T00:31:30Z

Support shieldlist for Template:Shieldlist

@@ Line 85: / Line 85: @@
 -- Display a link, accounting for presentation arguments
-local function displayLink(link, display, args, followNoLink)
+local function displayLink(link, display, args, followNoLink, noSelfRedirect)
 	local titleObj = mw.title.new(link)
 	local noLink = followNoLink and yesno(args.nolink)
 	local showRed = yesno(args.showred)
 		return '[[' .. link .. '|' .. display .. ']]' -- Return the link
 	else
@@ Line 98: / Line 102: @@
 -- Generate the text part of the output
-local function getText(route, roadInfo, args)
+local function getText(route, roadInfo, args, noSelfRedirect)
 	local link = ''
 	local display = ''
@@ Line 117: / Line 121: @@
 	end
-	return displayLink(link, display, args, true)
+	return displayLink(link, display, args, true, noSelfRedirect)
 end
@@ Line 186: / Line 190: @@
 end
--- Entry function
+-- Entry function for {{jcon}}
 function p.jcon(frame)
 	local args = getArgs(frame)
@@ Line 286: / Line 290: @@
 	return output
 end

BrandonXLF: Add for fulltext too

2024-08-15T00:22:34Z

Add for fulltext too

← Previous revision		Revision as of 00:22, 15 August 2024
Line 114:		Line 114:
	if yesno(args.fulltext) then		if yesno(args.fulltext) then
	-- Display the full link title when requested		-- Display the full link title when requested
	display = ~~link~~		display = roadInfo.prefix .. ' ' .. display
	end		end

BrandonXLF: Add namefirst, works like Template:Jctname

2024-07-29T15:59:17Z

Add namefirst, works like Template:Jctname

← Previous revision		Revision as of 15:59, 29 July 2024
Line 177:		Line 177:
	end		end

	if name then		if name and yesno(args.namefirst) then
			text = name .. ' (' .. text .. ')' -- Output name before text when namefirst is set to yes
			elseif name then
	text = text .. ' (' .. name .. ')' -- Add the name to the produced text		text = text .. ' (' .. name .. ')' -- Add the name to the produced text
	end		end

BrandonXLF: Don't add space when first shield is a "to" shield

2024-07-24T03:24:49Z

Don't add space when first shield is a "to" shield

← Previous revision		Revision as of 03:24, 24 July 2024
Line 215:		Line 215:

	if toShield ~= '' then		if toShield ~= '' then
	shield = shield .. ' ' .. toShield -- Add to shields to output		shield = shield .. (shield == '' and '' or ' ') .. toShield -- Add to shields to output
	end		end

BrandonXLF: Reduce expensive calls

2024-07-23T21:40:50Z

Reduce expensive calls

← Previous revision		Revision as of 21:40, 23 July 2024
Line 85:		Line 85:

	-- Display a link, accounting for presentation arguments		-- Display a link, accounting for presentation arguments
	local function displayLink(link, display, args)		local function displayLink(link, display, args, followNoLink)
	local titleObj = mw.title.new(link)		local titleObj = mw.title.new(link)
	local ~~showLink~~ = ~~((titleObj~~ and ~~titleObj.exists) or yesno(args.showred)) and not~~ yesno(args.nolink)		local noLink = followNoLink and yesno(args.nolink)
			local showRed = yesno(args.showred)

			if (not noLink) and (showRed or (titleObj and titleObj.exists)) then
	if showLink then
	return '[[' .. link .. '\|' .. display .. ']]' -- Return the link		return '[[' .. link .. '\|' .. display .. ']]' -- Return the link
	else		else
Line 116:		Line 117:
	end		end

	return displayLink(link, display, args)		return displayLink(link, display, args, true)
	end		end

	-- Gets the wikitext link for a place		-- Gets the wikitext link for a place
	local function getPlace(place, args)		local function getPlace(place, args)
	~~local placeArticle =~~ place .. ', Ontario'		return displayLink(place .. ', Ontario', place, args)
	local titleObj = mw.title.new(placeArticle)

	if (titleObj and titleObj.exists) or yesno(args.showred) then
	return '[[' .. placeArticle .. '\|' .. place .. ']]'
	else
	return place
	end
	end		end

Line 166:		Line 160:
	if routeText ~= '' then		if routeText ~= '' then
	if text ~= '' then text = text .. ' / ' end -- Add " / " after existing text		if text ~= '' then text = text .. ' / ' end -- Add " / " after existing text
	text = text .. ~~getText(args[paramName], routeRoadInfo, args)~~ -- Add route text		text = text .. routeText -- Add route text
	end		end
	end		end

BrandonXLF: Only generate shield once

2024-07-23T21:15:43Z

Only generate shield once

← Previous revision		Revision as of 21:15, 23 July 2024
Line 157:		Line 157:
	if routeShield ~= '' then		if routeShield ~= '' then
	if shield ~= '' then shield = shield .. ' ' end -- Add space after existing shields		if shield ~= '' then shield = shield .. ' ' end -- Add space after existing shields
	shield = shield .. ~~shieldWikitext(args[paramName], routeRoadInfo, args, prefix)~~ -- Add the shield		shield = shield .. routeShield -- Add the shield
	end		end
	end		end