Module:List: Difference between revisions

convert to Module:HtmlBuilder and fix list-style-type support
(first attempt to add support for list-style-type, but broken for now)
(convert to Module:HtmlBuilder and fix list-style-type support)
Line 3:
 
local p = {}
 
local htmlBuilder = require('Module:HtmlBuilder')
 
local function getListItem(data, style, itemStyle)
Line 8 ⟶ 10:
return nil
end
local item = htmlBuilder.create('li')
if style or itemStyle then
item
style = style or ''
.cssText(style)
itemStyle = itemStyle or ''
style, .cssText(itemStyle, data)
return mw.ustring.format(
.wikitext(data)
'<li style="%s%s">%s</li>',
return tostring(item)
style, itemStyle, data
)
else
return mw.ustring.format(
'<li>%s</li>',
data
)
end
end
 
Line 37 ⟶ 32:
table.sort(nums)
return nums
end
 
local function getClass(listType, args)
local classes = {}
if listType == 'horizontal' or listType == 'horizontal_ordered' then
table.insert(classes, 'hlist')
elseif listType == 'unbulleted' then
table.insert(classes, 'plainlist')
end
table.insert(classes, args.class)
local ret
if #classes == 0 then
return nil
end
return mw.ustring.format(' class="%s"', table.concat(classes, ' '))
end
 
local function getStyle(listType, args)
local styles = {}
if listType == 'horizontal' or listType == 'horizontal_ordered' then
local indent = args.indent and tonumber(indent)
indent = tostring((indent and indent * 1.6) or 0)
table.insert(styles, 'margin-left: ' .. indent .. 'em;')
end
local listStyleType = args['list-style-type']
if listStyleType then
table.insert(styles, 'list-style-type: ' .. listStyleType .. ';')
end
table.insert(styles, args.style)
if #styles == 0 then
return nil
end
return mw.ustring.format(' style="%s"', table.concat(styles, ' '))
end
 
Line 88 ⟶ 50:
return ''
end
-- Build the list html.
-- Check if we need a ul tag or an ol tag, and get the start and type attributes for ordered lists.
local listTagroot = htmlBuilder.create('uldiv')
if listType == 'horizontal' or listType == 'horizontal_ordered' then
local startAttr, typeAttr
root.addClass('hlist')
if listType == 'ordered' or listType == 'horizontal_ordered' then
elseif listType == 'unbulleted' then
listTag = 'ol'
tableroot.insertaddClass(classes, 'plainlist')
startAttr = args.start
end
if startAttr then
root.addClass(args.class)
startAttr = ' start="' .. startAttr .. '"'
if listType == 'horizontal' or listType == 'horizontal_ordered' then
end
typeAttrlocal indent = args.typeindent and tonumber(indent)
local indent = args.tostring((indent and tonumber(indent * 1.6) or 0)
if typeAttr then
typeAttr = root.css(' type="margin-left', .. typeAttrindent .. '"em')
end
end
tableroot.insertcssText(styles, args.style)
startAttr = startAttr or ''
iflocal list = root.tag((listType == 'ordered' or listType == 'horizontal_ordered') thenand 'ol' or 'ul')
typeAttr = typeAttr or ''
list
-- Get the classes and styles and output the list.
startAttr =.attr('start', args.start)
local class = getClass(listType, args) or ''
.attr('type', args.type)
local style = getStyle(listType, args) or ''
local listStyleType = .css('list-style-type', args['list-style-type'])
local list_style = .cssText(args.list_style or args.ul_style or args.ol_style) -- ul_style and ol_style are included for backwards compatibility. No distinction is made for ordered or unordered lists.
list_style = list_style and (' style="' .. list_style .. '"') or ''
.wikitext(table.concat(listItems))
return mw.ustring.format(
return tostring(root)
'<div%s%s><%s%s%s%s>%s</%s></div>',
class, style, listTag, startAttr, typeAttr, list_style, table.concat(listItems), listTag
)
end