Module:Demo - Revision history

Rickyboy320: 40 revisions imported: Import Template Tlx and subtemplates

2017-08-11T18:29:05Z

40 revisions imported: Import Template Tlx and subtemplates

2015-01-30T22:21:59Z

maybe this is the better way

2015-01-30T20:58:58Z

I'll clean this up later

2015-01-30T20:47:25Z

pass args

2015-01-27T22:51:27Z

2015-01-27T22:31:37Z

named params first

2015-01-27T21:32:56Z

fix frame/parent arg issue

2015-01-27T02:17:53Z

2015-01-27T02:13:28Z

2015-01-27T02:11:17Z

@@ Line 42: / Line 42: @@
 	return {
 		source = noWiki or code,
-		output = orphan:preprocess(code),
+		output = orphan:preprocess(code):gsub(frame.args.demo_kill_categories and '%[%[Category.-%]%]' or '', ''),
 		frame = frame
+	}
@@ Line 48: / Line 48: @@
 function p.main(frame, demoTable)
-	local demo_args = (frame:getParent() or frame).args
+	local show = demoTable or p.get(frame)
 	local args = show.frame.args
 	args.br = tonumber(args.br or 1) and ('<br>'):rep(args.br or 1) or args.br or ''
@@ Line 66: / Line 65: @@
 		'demo_main',
 		'demo_br',
-		'demo_result_arg'
+		'demo_result_arg',
 	})
 	local template = frame.args.demo_template and 'Template:'..frame.args.demo_template
@@ Line 97: / Line 97: @@
 		return p.main(orphan, {
 			source = mw.text.encode(table.concat(source), "<>'|=~"),
-			output = tostring(demoModule(orphan)),
+			output = tostring(demoModule(orphan)):gsub(frame.args.demo_kill_categories and '%[%[Category.-%]%]' or '', ''),
 			frame = frame
 		})

@@ Line 48: / Line 48: @@
 function p.main(frame, demoTable)
-	local show = demoTable or p.get(frame, (frame:getParent() or frame).args.passArgs)
+	local demo_args = (frame:getParent() or frame).args
 	local args = show.frame.args
 	args.br = tonumber(args.br or 1) and ('<br>'):rep(args.br or 1) or args.br or ''

@@ Line 48: / Line 48: @@
 function p.main(frame, demoTable)
-	local show = demoTable or p.get(frame)
+	local show = demoTable or p.get(frame, (frame:getParent() or frame).args.passArgs)
 	local args = show.frame.args
 	args.br = tonumber(args.br or 1) and ('<br>'):rep(args.br or 1) or args.br or ''

@@ Line 73: / Line 73: @@
 	if demoModule then
 		local named = {insert = function(self, ...) table.insert(self, ...) return self end}
-		local source = {insert = named.insert, '{{', template and '' or '#invoke:', frame.args.demo_template or frame.args.demo_module, template and '' or '|', not template and demoFunc or '\n'}
+		local source = {insert = named.insert, '{{', frame.args.demo_template or frame.args.demo_module, '\n'}
 		local insertNamed = #source + 1
 		for k, v in pairs(orphan.args) do

@@ Line 72: / Line 72: @@
 	frame.args.br, frame.args.result_arg = frame.args.demo_br, frame.args.demo_result_arg
 	if demoModule then
-		local source = {insert = function(self, ...) table.insert(self, ...) return self end, '{{', template and '' or '#invoke:', frame.args.demo_template or frame.args.demo_module, template and '' or '|', not template and demoFunc or '\n'}
+		local named = {insert = function(self, ...) table.insert(self, ...) return self end}
 		for k, v in pairs(orphan.args) do
 			local nan, insert = type(k) ~= 'number', {v}
-			source:insert'|'
+			local target = nan and named or source
 			if nan then
-				source:insert(k):insert'=':insert'\n'
+				target:insert(k):insert'=':insert'\n'
-				table.insert(insert, 1, #source)
+				table.insert(insert, 1, #target)
 			end
-			source:insert(unpack(insert))
+			target:insert(unpack(insert))
 			local nowiki = v:match('nowiki')
 			if nowiki or v:match('{{.-}}') then
@@ Line 87: / Line 90: @@
 		end
 		source:insert'}}'
 		return p.main(orphan, {
 			source = mw.text.encode(table.concat(source), "<>'|=~"),

← Older revision	Revision as of 18:29, 11 August 2017
(No difference)

@@ Line 4: / Line 4: @@
 --unless a table containing a list keys of not to inherit is provided
 function disinherit(frame, onlyTheseKeys)
-	local orphan, parent, args = frame:newChild{}, frame:getParent(), {}
+	local parent = frame:getParent() or frame
-	orphan.getParent = (parent or frame).getParent --returns nil
+	local orphan = parent:newChild{}
-	--setmetatable(orphan.args, {index = args})
+	orphan.getParent = parent.getParent --returns nil
-	--if 1 then return orphan, frame end
+	orphan.args = {}
 	if onlyTheseKeys then
-		for _, f in ipairs(parent and {parent.args, frame.args} or {frame.args})do
+		local family = {parent, frame}
-			for k, v in pairs(f) do
+		for f = 1, 2 do
-				args[k] = args[k] or v
+			for k, v in pairs(family[f] and family[f].args or {}) do
 			end
 		end
 		for _, k in ipairs(onlyTheseKeys) do
-			args[k] = nil
+			rawset(orphan.args, k, nil)
 		end
 	end
-	return orphan, frame
+	return orphan, parent
 end
@@ Line 65: / Line 67: @@
 		'demo_result_arg'
 	})
 	local template = frame.args.demo_template and 'Template:'..frame.args.demo_template
 	local demoFunc = frame.args.demo_module_func or 'main\n'

@@ Line 19: / Line 19: @@
 		orphan.args = args
 	end
 	return orphan, frame
 end
@@ Line 82: / Line 81: @@
 			source:insert(unpack(insert))
 			if v:match('nowiki') then
-				orphan.args = frame:preprocess(mw.text.unstripNoWiki(v))
+				orphan.args[k] = frame:preprocess(mw.text.unstripNoWiki(v))
 			end
 		end