Module:Tt/Draft: Difference between revisions

(2 intermediate revisions by the same user not shown)

Line 19:

function p._main(args, options)

local text = args[1]

local tooltip = args[2]

local tooltip = mw.text.decode(args[2], true)

local header = lib.isNotEmpty(args.header) and args.header or nil

local header = lib.isNotEmpty(args.header) and mw.text.decode(args.header, true) or nil

local class = lib.isNotEmpty(args.class) and args.class .. ' custom-tt-wrapper toggle-tooltip' or 'custom-tt-wrapper toggle-tooltip'

local out = mw.html.create()

Line 33:

Line 34:

-- Build toggle tooltip

local toggle = out:tag('span'):addClass(~~'custom-tt-wrapper toggle-tooltip'~~)

local toggle = out:tag('span'):addClass(class)

-- Optional toggleable text but plain text must be there for gadget

Line 75:

Line 76:

local full = tx

local result = tx

for display in string.gmatch(full,

for display~~, tooltip~~ in string.gmatch(full, '(.-)(.-)~~') do~~

'<span[^>]*class="[^"]*custom%-tt%-wrapper[^"]*"[^>]*>' ..

~~local escTooltip~~ = ~~tooltip:gsub(~~"([^%w]~~)", "~~%%%1")

'<span[^>]*class="[^"]*mw%-collapsible%-toggle[^"]*"[^>]*>(.-)' ..

'<span[^>]*class="[^"]*mw%-collapsible%-content[^"]*"[^>]*>.-'

) do

local escDisplay = display:gsub("([^%w])", "%%%1")

search_str = '(' .. ~~escDisplay ..~~ ')' .. ~~escTooltip~~ .. '~~<span~~[^>]~~+><span~~[^>]~~+>' .. escDisplay .. '<span~~[^>]+>' .~~. escTooltip .. '~~'

local search_str =

'<span[^>]*class="[^"]*custom%-tt%-wrapper[^"]*"[^>]*>' ..

'<span[^>]*class="[^"]*mw%-collapsible%-toggle[^"]*"[^>]*>' .. escDisplay .. '' ..

'<span[^>]*class="[^"]*mw%-collapsible%-content[^"]*"[^>]*>.-'

result = result:gsub(search_str, display)

end

@@ Line 19: / Line 19: @@
 function p._main(args, options)
 	local text = args[1]
-	local tooltip = args[2]
+	local tooltip = mw.text.decode(args[2], true)
-	local header = lib.isNotEmpty(args.header) and args.header or nil
+	local header = lib.isNotEmpty(args.header) and mw.text.decode(args.header, true) or nil
+	local class = lib.isNotEmpty(args.class) and args.class .. ' custom-tt-wrapper toggle-tooltip' or 'custom-tt-wrapper toggle-tooltip'
 	local out = mw.html.create()
@@ Line 33: / Line 34: @@
 	-- Build toggle tooltip
-	local toggle = out:tag('span'):addClass('custom-tt-wrapper toggle-tooltip')
+	local toggle = out:tag('span'):addClass(class)
 	-- Optional toggleable text but plain text must be there for gadget
@@ Line 75: / Line 76: @@
 	local full = tx
 	local result = tx
+	for display in string.gmatch(full,
-	for display, tooltip in string.gmatch(full, '<span class="text%-tooltip hover%-tooltip">(.-)<span class="tt%-content">(.-)</span></span>') do
+		'<span[^>]*class="[^"]*custom%-tt%-wrapper[^"]*"[^>]*>' ..
-		local escTooltip = tooltip:gsub("([^%w])", "%%%1")
+		'<span[^>]*class="[^"]*mw%-collapsible%-toggle[^"]*"[^>]*>(.-)</span>' ..
+		'<span[^>]*class="[^"]*mw%-collapsible%-content[^"]*"[^>]*>.-</span></span>'
+	) do
 		local escDisplay = display:gsub("([^%w])", "%%%1")
-		search_str = '<span class="text%-tooltip hover%-tooltip">(' .. escDisplay .. ')<span class="tt%-content">' .. escTooltip .. '</span></span><span[^>]+><span[^>]+>' .. escDisplay .. '</span><span[^>]+>' .. escTooltip .. '</span></span>'
+		local search_str =
+			'<span[^>]*class="[^"]*custom%-tt%-wrapper[^"]*"[^>]*>' ..
+			'<span[^>]*class="[^"]*mw%-collapsible%-toggle[^"]*"[^>]*>' .. escDisplay .. '</span>' ..
+			'<span[^>]*class="[^"]*mw%-collapsible%-content[^"]*"[^>]*>.-</span></span>'
 		result = result:gsub(search_str, display)
 	end

Module:Tt/Draft: Difference between revisions

Kuhlau (talk | contribs)