Module:Sprite: Difference between revisions

Line 147:

function p.doc( f )

local ~~args~~ = ~~require~~( 'Module:~~ProcessArgs~~' ~~).norm(~~ f.args )

local settings = mw.loadData( 'Module:' + f.args[1] )

local idTable = mw.title.new( 'Module:Sprite/' .. ~~args~~.name ):getContent()

local idTable = mw.title.new( 'Module:' .. ( settings.ids or 'Sprite/' .. settings.name ) ):getContent()

idTable = idTable:gsub( '(\n%s*%-%-%s*.-%s*%-%-%s*\n)', '%1,' ):gsub( '^return {', '' ):gsub( '}$', '' )

Line 198:

for i, id2 in ipairs( id ) do

if i == 1 then

~~args[1] = id2~~

table.insert( list, p.sprite{ id2, settings = settings } .. '</td><td><div class="sprite-id"><code>' .. id2 .. '</code></div>' )

table.insert( list, p.sprite~~( args )~~ .. '</td><td><div class="sprite-id"><code>' .. id2 .. '</code></div>' )

else

table.insert( list, '<div class="sprite-id"><code>' .. id2 .. '</code></div>' )

Line 205:

Line 204:

end

else

~~args[1] = id~~

table.insert( list, p.sprite{ id, settings = settings } .. '</td><td><div class="sprite-id"><code>' .. id .. '</code></div>' )

table.insert( list, p.sprite~~( args )~~ .. '</td><td><div class="sprite-id"><code>' .. id .. '</code></div>' )

end

table.insert( list, '</td></tr></table></li>' )

Line 216:

Line 214:

local out = table.concat( list )

if not args.refresh then

if not f.args.refresh then

out = f:preprocess( '{{#widget:stylesheet|page=Sprite doc}}' ) .. '<div id="sprite-doc" data-details=\'{"name":"' .. ~~args~~.name .. '","size":' .. ( ~~args~~.size or 16 ) .. '}\'>' .. out .. '</div>'

out = f:preprocess( '{{#widget:stylesheet|page=Sprite doc}}' ) .. '<div id="sprite-doc" data-details=\'{"name":"' .. settings.name .. '","size":' .. ( settings.size or 16 ) .. '}\'>' .. out .. '</div>'

end

@@ Line 147: / Line 147: @@
 function p.doc( f )
-	local args = require( 'Module:ProcessArgs' ).norm( f.args )
+	local settings = mw.loadData( 'Module:' + f.args[1] )
-	local idTable = mw.title.new( 'Module:Sprite/' .. args.name ):getContent()
+	local idTable = mw.title.new( 'Module:' .. ( settings.ids or 'Sprite/' .. settings.name ) ):getContent()
 	idTable = idTable:gsub( '(\n%s*%-%-%s*.-%s*%-%-%s*\n)', '%1,' ):gsub( '^return {', '' ):gsub( '}$', '' )
@@ Line 198: / Line 198: @@
 			for i, id2 in ipairs( id ) do
 				if i == 1 then
-					args[1] = id2
+					table.insert( list, p.sprite{ id2, settings = settings } .. '</td><td><div class="sprite-id"><code>' .. id2 .. '</code></div>' )
-					table.insert( list, p.sprite( args ) .. '</td><td><div class="sprite-id"><code>' .. id2 .. '</code></div>' )
 				else
 					table.insert( list, '<div class="sprite-id"><code>' .. id2 .. '</code></div>' )
@@ Line 205: / Line 204: @@
 			end
 		else
-			args[1] = id
+			table.insert( list, p.sprite{ id, settings = settings } .. '</td><td><div class="sprite-id"><code>' .. id .. '</code></div>' )
-			table.insert( list, p.sprite( args ) .. '</td><td><div class="sprite-id"><code>' .. id .. '</code></div>' )
 		end
 		table.insert( list, '</td></tr></table></li>' )
@@ Line 216: / Line 214: @@
 	local out = table.concat( list )
-	if not args.refresh then
+	if not f.args.refresh then
-		out = f:preprocess( '{{#widget:stylesheet|page=Sprite doc}}' ) .. '<div id="sprite-doc" data-details=\'{"name":"' .. args.name .. '","size":' .. ( args.size or 16 ) .. '}\'>' .. out .. '</div>'
+		out = f:preprocess( '{{#widget:stylesheet|page=Sprite doc}}' ) .. '<div id="sprite-doc" data-details=\'{"name":"' .. settings.name .. '","size":' .. ( settings.size or 16 ) .. '}\'>' .. out .. '</div>'
 	end