Module:Tt: Difference between revisions

Browse history interactively

← Older edit

@@ Line 4: / Line 4: @@
 	local args = require('Module:Arguments').getArgs(frame, {
 		parentFirst = true,
-		wrappers = { 'Template:Tt' }
+		wrappers = {'Template:Tt'}
 	})
@@ Line 11: / Line 11: @@
 	if args.clean then
 		return p.CleanTT(args[1])
-	elseif not args[2] or args[2] == '' then
+	end
+	if not args[2] or mw.text.trim(args[2]) == '' then
 		return args[1]
-	else
-		return p._main(args)
 	end
+	return p._main(args)
 end
@@ Line 21: / Line 23: @@
 	local text = args[1]
 	local tooltip = mw.text.decode(args[2], true)
-	local out = mw.html.create()
-	out:wikitext('&zwj;')
+	local out = mw.html.create('span')
+		:addClass('custom-tt-wrapper')
+		:addClass(args.class or '')
+	local visibleText = text
+	local cleanText = text
-	local toggle = out:tag('span')
+	-- Handle explicit link parameter
-		:addClass('custom-tt-wrapper')
+	if args.link and mw.text.trim(tostring(args.link)) ~= '' then
-		:addClass('toggle-tooltip')
+		local link = tostring(args.link)
-		:addClass('mw-collapsible')
-		:addClass('mw-collapsed')
-		:addClass('giw-collapsible')
-	if args.class and args.class ~= '' then
+		visibleText = '[[' ..
-		toggle:addClass(args.class)
+			(link == '1' and text or link) ..
-	end
+			'|' ..
+			text ..
+			']]'
-	-- Make the text clickable if a link is provided,
+		cleanText = text
-	-- or if the text already contains a wiki link.
-	if (args.link and args.link ~= '') or (text:find('%[%[') and text:find('%]%]')) then
-		local link = tostring(args.link or '')
-		if link == '1' then
+	-- Handle text that is already an internal link
-			toggle:wikitext(
+	elseif text:find('%[%[') and text:find('%]%]') then
-				'[[', text, ']]', '&thinsp;'
+		visibleText = text
-			)
-		elseif link ~= '' then
-			toggle:wikitext(
-				'[[', link, '|', text, ']]', '&thinsp;'
-			)
-		else
-			toggle:wikitext(text, '&thinsp;')
-		end
-		-- Add accessible text and an info icon.
+		cleanText = text
-		local cleanText = text
+			:gsub('%[%[[^%]|]+|', '')
-			:gsub('%[%[?[^|%]]+|', '')
 			:gsub('%[%[', '')
 			:gsub('%]%]', '')
-		text =
-			'<span class="screen-reader-text">Tooltip for '
-			.. cleanText
-			.. '</span>ⓘ'
 	end
-	toggle:attr('data-tt-text', text)
+	-- Visible text
+	out:wikitext(visibleText)
-	-- Toggle
+	-- Tooltip trigger
-	toggle:tag('span')
+	local trigger = out:tag('span')
-		:addClass('mw-collapsible-toggle')
+		:addClass('custom-tt-trigger')
-		:addClass('mw-collapsible-toggle-collapsed')
+		:attr('tabindex', '0')
-		:addClass('custom-tt')
+		:attr('role', 'button')
-		:wikitext(text)
+		:attr('aria-label', 'Tooltip for ' .. cleanText)
-		:done()
+		:wikitext('ⓘ')
 	-- Tooltip
-	toggle:tag('span')
+	out:tag('span')
-		:addClass('mw-collapsible-content')
+		:addClass('custom-tt-content')
-		:addClass('custom-tt')
-		:css('display', 'none')
 		:wikitext(tooltip)
-		:done()
-	out:wikitext('&zwj;')
 	return out
@@ Line 89: / Line 73: @@
 function p.CleanTT(tx)
-	local clean = tx:gsub(
+	return tx:gsub(
-		'&zwj;<span class="custom%-tt%-wrapper[^>]-data%-tt%-text="(.-)">.-&zwj;',
+		'<span class="custom%-tt%-wrapper[^>]*>.-</span>',
-		'%1'
+		''
 	)
-	return clean
 end
 return p

Module:Tt: Difference between revisions

ReisuDesign (talk | contribs)