Module:Error/sandbox - Revision history

Jackmcbarn: tweak invoke-detecting logic

2014-12-05T01:48:04Z

tweak invoke-detecting logic

← Previous revision		Revision as of 01:48, 5 December 2014
Line 20:		Line 20:
	function p.error(frame)		function p.error(frame)
	local args		local args
	if frame == ~~mw.getCurrentFrame()~~ then		if type(frame.args) == 'table' then
	-- We're being called via #invoke. The args are passed through to the module		-- We're being called via #invoke. The args are passed through to the module
	-- from the template page, so use the args that were passed into the template.		-- from the template page, so use the args that were passed into the template.

Jackmcbarn: simplify _error

2014-12-05T01:45:05Z

simplify _error

← Previous revision		Revision as of 01:45, 5 December 2014
Line 4:		Line 4:

	local function _error(args)		local function _error(args)
	local message = args.message or args[1] or error('no message specified', 2)
	message = tostring(message)
	local tag = mw.ustring.lower(tostring(args.tag))		local tag = mw.ustring.lower(tostring(args.tag))

Line 14:		Line 12:

	-- Generate the html.		-- Generate the html.
	~~local root =~~ mw.html.create(tag)		return tostring(mw.html.create(tag)
⚫	~~root~~
	:addClass('error')		:addClass('error')
	:wikitext(message)		:wikitext(tostring(args.message or args[1] or error('no message specified', 2)))
		⚫	)

	return tostring(root)
	end		end

Jackmcbarn: use mw.html

2014-12-05T01:42:32Z

use mw.html

← Previous revision		Revision as of 01:42, 5 December 2014
Line 2:		Line 2:

	local p = {}		local p = {}

	local HtmlBuilder = require('Module:HtmlBuilder')

	local function _error(args)		local function _error(args)
Line 16:		Line 14:

	-- Generate the html.		-- Generate the html.
	local root = ~~HtmlBuilder~~.create(tag)		local root = mw.html.create(tag)
	root		root
	.addClass('error')		:addClass('error')
	.wikitext(message)		:wikitext(message)

	return tostring(root)		return tostring(root)

Jackmcbarn: sync

2014-12-05T01:41:45Z

sync

@@ Line 1: / Line 1: @@
 -- This module implements {{error}}.
 local p = {}
-function p._error(args)
+local function _error(args)
-	local message = args.message or args[1] or error('no message specified', 2)
+    message = tostring(message)
-	local tag = args.tag or ''
+    local tag = mw.ustring.lower(tostring(args.tag))
-	-- Work out what HTML tag we should use
+    -- Work out what html tag we should use.
-	if not (tag == 'p' or tag == 'span' or tag == 'div') then
+        tag = 'strong'
-	-- Generate the HTML
+    -- Generate the html.
-	local ret = string.format(
+    local root = HtmlBuilder.create(tag)
 end

Mr. Stradivarius: add category option and refactor the arg-getting code to use Module:Arguments

2014-02-24T01:48:13Z

add category option and refactor the arg-getting code to use Module:Arguments

@@ Line 1: / Line 1: @@
 -- This module implements {{error}}.
 local p = {}
-local function _error(args)
+function p._error(args)
-    message = tostring(message)
+	local message = args.message or args[1] or error('no message specified', 2)
-    local tag = mw.ustring.lower(tostring(args.tag))
+	local tag = args.tag or ''
-    -- Work out what html tag we should use.
+	-- Work out what HTML tag we should use
-    if not (tag == 'p' or tag == 'span' or tag == 'div') then
+	tag = tag:lower()
-        tag = 'strong'
+		tag = 'strong'
-    end
+	end
-    -- Generate the html.
+	-- Generate the HTML
-    local root = HtmlBuilder.create(tag)
+	local ret = string.format(
 end

Mr. Stradivarius: sync

2014-02-24T01:34:27Z

sync

@@ Line 6: / Line 6: @@
 local function _error(args)
     message = tostring(message)
     local tag = mw.ustring.lower(tostring(args.tag))
@@ Line 41: / Line 34: @@
         -- the args are passed in directly.
         args = frame
     end
     return _error(args)

DePiep: ←Created page with '-- This module implements {{error}}. local p = {} local HtmlBuilder = require('Module:HtmlBuilder') local function _error(args) -- sandbox: move arg logic...'

2013-04-04T20:53:21Z

←Created page with '-- This module implements {{error}}. local p = {} local HtmlBuilder = require('Module:HtmlBuilder') local function _error(args) -- sandbox: move arg logic...'

New page

-- This module implements {{error}}.

local p = {}

local HtmlBuilder = require('Module:HtmlBuilder')

local function _error(args)
-- sandbox: move arg logic together here
-- If the message parameter is present but blank, change it to nil so that Lua will
-- consider it false.
if args.message == "" then
args.message = nil
end
-- sandbox: remove internal error message
local message = args.message or args[1]
message = tostring(message)
local tag = mw.ustring.lower(tostring(args.tag))

-- Work out what html tag we should use.
if not (tag == 'p' or tag == 'span' or tag == 'div') then
tag = 'strong'
end

-- Generate the html.
local root = HtmlBuilder.create(tag)
root
.addClass('error')
.wikitext(message)

return tostring(root)
end

function p.error(frame)
local args
if frame == mw.getCurrentFrame() then
-- We're being called via #invoke. The args are passed through to the module
-- from the template page, so use the args that were passed into the template.
args = frame.args
else
-- We're being called from another module or from the debug console, so assume
-- the args are passed in directly.
args = frame
end
return _error(args)
end

return p