Module:List - Revision history

WikiSysop: 27 revisions

2014-11-17T18:05:10Z

27 revisions

Mr. Stradivarius: remove li_style, ul_style and ol_style parameters, allow itemn_style and itemn_value parameters, and add a tracking category for item_stylen and item_valuen parameters

2014-06-12T09:21:46Z

remove li_style, ul_style and ol_style parameters, allow itemn_style and itemn_value parameters, and add a tracking category for item_stylen and item_valuen parameters

Mr. Stradivarius: don't mark item_stylen parameters as deprecated yet - needs to be saved for the next stage of conversion

2014-06-11T12:19:07Z

don't mark item_stylen parameters as deprecated yet - needs to be saved for the next stage of conversion

Mr. Stradivarius: Changed protection level of Module:List: High-risk Lua module: used by Template:Unbulleted list ([Edit=Allow only template editors and admins] (indefinite) [Move=Allow only template editors and admins] (indefinite))

2014-05-26T01:22:22Z

Changed protection level of Module:List: High-risk Lua module: used by Template:Unbulleted list ([Edit=Allow only template editors and admins] (indefinite) [Move=Allow only template editors and admins] (indefinite))

Mr. Stradivarius: split the HTML rendering code out into a separate function, add a tracking category for deprecated parameters, ignore blank/whitespace arguments, and replace getArgNums with the equivalent function in Module:TableTools

2014-05-26T01:15:39Z

split the HTML rendering code out into a separate function, add a tracking category for deprecated parameters, ignore blank/whitespace arguments, and replace getArgNums with the equivalent function in Module:TableTools

Show changes

Mr. Stradivarius: add fix to make the start parameter work with horizontal ordered lists, and switch to Module:Arguments for argument processing

2014-01-07T03:15:57Z

add fix to make the start parameter work with horizontal ordered lists, and switch to Module:Arguments for argument processing

Mr. Stradivarius: Protected Module:List: High-risk Lua module: ~1,100 transclusions ([Edit=Allow only autoconfirmed users] (indefinite) [Move=Allow only autoconfirmed users] (indefinite))

2014-01-07T02:14:58Z

Protected Module:List: High-risk Lua module: ~1,100 transclusions ([Edit=Allow only autoconfirmed users] (indefinite) [Move=Allow only autoconfirmed users] (indefinite))

Mr. Stradivarius: only use type and list_style_type with ordered and horizontal ordered lists

2013-11-24T15:00:23Z

only use type and list_style_type with ordered and horizontal ordered lists

Mr. Stradivarius: fix ordered lists - had a stupid variable clash

2013-11-24T13:24:27Z

fix ordered lists - had a stupid variable clash

Mr. Stradivarius: simplify the type-property-checking code

2013-11-23T17:42:02Z

simplify the type-property-checking code

@@ Line 80: / Line 80: @@
 	 -- ul_style and ol_style are included for backwards compatibility. No
 	 -- distinction is made for ordered or unordered lists.
-	data.listStyle = args.list_style or args.ul_style or args.ol_style
+	data.listStyle = args.list_style
 	-- List items
@@ Line 90: / Line 90: @@
 		local item = {}
 		item.content = args[num]
-		item.style = args['item_style' .. tostring(num)]
+		item.style = args['item' .. tostring(num) .. '_style']
-			or args['li_style' .. tostring(num)]
+			or args['item_style' .. tostring(num)]
-		item.value = args['item_value' .. tostring(num)]
+		item.value = args['item' .. tostring(num) .. '_value']
 		table.insert(data.items, item)
 	end
@@ Line 148: / Line 149: @@
 function p.renderTrackingCategories(args)
 	local isDeprecated = false -- Tracks deprecated parameters.
-	for i, param in ipairs{'ul_style', 'ol_style', 'li_style'} do
+	for k, v in pairs(args) do
-		if args[param] then
+		k = tostring(k)
 			isDeprecated = true
 			break
 		end
 	end

@@ Line 157: / Line 157: @@
 		for k, v in pairs(args) do
 			k = tostring(k)
-			if k:find('^item_style%d+$') or k:find('^li_style%d+$') then
+			if k:find('^li_style%d+$') then
 				isDeprecated = true
 				break

@@ Line 4: / Line 4: @@
 local p = {}
 local htmlBuilder = require('Module:HtmlBuilder')
@@ Line 22: / Line 23: @@
 local function getArgNums(args)
-	-- Returns an array containing the keys of all positional arguments
+	-- Returns an array containing the keys of all positional arguments that contain data (i.e. non-whitespace values).
 	local nums = {}
 	for k, v in pairs(args) do
@@ Line 84: / Line 84: @@
 	-- Build the list tags and list items.
 	local list = root.tag((listType == 'ordered' or listType == 'horizontal_ordered') and 'ol' or 'ul')
 	list
 		.attr('type', typeAttr)
 		.css('list-style-type', listStyleType)
@@ Line 95: / Line 104: @@
 local function makeWrapper(listType)
 	return function(frame)
-		local origArgs
+		local args = getArgs(frame, {
-		if frame == mw.getCurrentFrame() then
+			valueFunc = function (key, value)
-			origArgs = frame:getParent().args
+				if type(key) == 'number' or value ~= '' then
-			for k, v in pairs(frame.args) do
+					return value
-				origArgs = frame.args
+				end
 			end
-		end
+		})
 		return p.makeList(listType, args)
 	end

@@ Line 54: / Line 54: @@
 		return ''
 	end
-	-- Build the list html.
+	-- Build the opening div tag.
 	local root = htmlBuilder.create('div')
 	if listType == 'horizontal' or listType == 'horizontal_ordered' then
@@ Line 66: / Line 66: @@
 		indent = tostring((indent and indent * 1.6) or 0)
 		root.css('margin-left', indent .. 'em')
 	end
 	-- Detect if the type attribute specified by args.type is using an invalid value, and if so try passing it as a list-style-type CSS property.
 	if typeAttr and not typeAttr:match('^%s*[1AaIi]%s*$') then
 		if not listStyleType then
@@ Line 77: / Line 82: @@
 	end
 	root.cssText(args.style)
 	local list = root.tag((listType == 'ordered' or listType == 'horizontal_ordered') and 'ol' or 'ul')
 	list

@@ Line 69: / Line 69: @@
 	-- Detect if the type attribute specified by args.type is using an invalid value, and if so try passing it as a list-style-type CSS property.
 	local listStyleType = args.list_style_type or args['list-style-type']
-	local listType = args['type']
+	local typeAttr = args['type']
-	if listType and not listType:match('^%s*[1AaIi]%s*$') then
+	if typeAttr and not typeAttr:match('^%s*[1AaIi]%s*$') then
 		if not listStyleType then
-			listStyleType = listType
+			listStyleType = typeAttr
-			listType = nil
+			typeAttr = nil
 		end
 	end
@@ Line 80: / Line 80: @@
 	list
 		.attr('start', args.start)
-		.attr('type', listType)
+		.attr('type', typeAttr)
 		.css('list-style-type', listStyleType)
 		.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.

← Older revision	Revision as of 18:05, 17 November 2014
(No difference)

← Older revision	Revision as of 01:22, 26 May 2014
(No difference)

← Older revision	Revision as of 02:14, 7 January 2014
(No difference)