Module:File link/sandbox - Revision history

Mr. Stradivarius: tweak the error message

2014-12-18T14:04:02Z

tweak the error message

← Previous revision		Revision as of 14:04, 18 December 2014
Line 85:		Line 85:
	})		})
	if not origArgs.file then		if not origArgs.file then
	error('[[Template:File link]] ~~error: no file specified.'~~, 0)		error("'file' parameter missing from [[Template:File link]]", 0)
	end		end

2014-12-18T14:02:10Z

test it with error level 0

← Previous revision		Revision as of 14:02, 18 December 2014
Line 85:		Line 85:
	})		})
	if not origArgs.file then		if not origArgs.file then
	error('[[Template:File link]] error: no file specified.', 2)		error('[[Template:File link]] error: no file specified.', 0)
	end		end

2014-12-18T14:00:15Z

for non-existent files called from p.main, use an error message that is more likely to be useful for editors

← Previous revision		Revision as of 14:00, 18 December 2014
Line 84:		Line 84:
	wrappers = 'Template:File link'		wrappers = 'Template:File link'
	})		})
			if not origArgs.file then
			error('[[Template:File link]] error: no file specified.', 2)
			end

	-- Copy the arguments that were passed to a new table to avoid looking up		-- Copy the arguments that were passed to a new table to avoid looking up
	-- every possible parameter in the frame object.		-- every possible parameter in the frame object.

2014-12-18T13:07:43Z

use yesno to test whether to add a border

← Previous revision		Revision as of 13:07, 18 December 2014
Line 1:		Line 1:
	-- This module provides a library for formatting file wikilinks.		-- This module provides a library for formatting file wikilinks.

			local yesno = require('Module:Yesno')
	local checkType = require('libraryUtil').checkType		local checkType = require('libraryUtil').checkType

Line 57:		Line 58:
	end		end

			-- Border
	addPositional('border')
			if yesno(args.border) then
			ret[#ret + 1] = 'border'
			end

	addPositional('location')		addPositional('location')
	addPositional('alignment')		addPositional('alignment')

2014-12-18T11:42:44Z

add a special value "_BLANK" to make blank values from templates

← Previous revision		Revision as of 11:42, 18 December 2014
Line 83:		Line 83:
	local args = {}		local args = {}
	for k, v in pairs(origArgs) do		for k, v in pairs(origArgs) do
			-- Make _BLANK a special argument to add a blank parameter. For use in
			-- conditional templates etc. it is useful for blank arguments to be
			-- ignored, but we still need a way to specify them so that we can do
			-- things like [[File:Example.png\|link=]].
			if v == '_BLANK' then
			v = ''
			end
	args[k] = v		args[k] = v
	end		end

2014-12-18T10:51:13Z

make this a lot simpler - the original module was overkill for what it was trying to do

2014-06-04T06:08:52Z

allow height and width methods to accept strings ending with "px"

@@ Line 5: / Line 5: @@
 local fileLink = {}
 function fileLink.new(filename)
@@ Line 52: / Line 64: @@
 	end
-	local function sizeError(methodName)
+	local function validateSize(method, px)
-		-- Used for formatting duplication errors in size-related methods.
+		-- Validate input for size-related functions. The px type is checked
 	end
 	function data:width(px)
 		checkSelf(self, 'width')
-		checkType('fileLink:width', 1, px, 'number', true)
+		checkTypeStringOrNum('fileLink:width', 1, px)
 		data.theWidth = px
 		return self
 	end
 	function data:height(px)
 		checkSelf(self, 'height')
-		checkType('fileLink:height', 1, px, 'number', true)
+		checkTypeStringOrNum('fileLink:height', 1, px)
 		data.theHeight = px
 		return self
@@ Line 185: / Line 217: @@
 		data.theLang = s
 		return self
 	end

2014-06-03T09:19:24Z

add two more private fields

2014-06-03T09:17:39Z

add "escape" method for outputting links with the colon trick

@@ Line 224: / Line 224: @@
 		checkType('fileLink:caption', 1, s, 'string', true)
 		data.theCaption = s
 		return self
 	end
@@ Line 229: / Line 240: @@
 	function data:render()
 		checkSelf(self, 'render')
 		if not data.theName then
 			error('fileLink:render: no filename was found')
 		end
 		ret[#ret + 1] = 'File:' .. data.theName

2014-06-03T09:09:21Z

add missing private fields