Module:Sprite - Revision history

Patbox: 91 revisions imported

2024-07-04T12:26:15Z

91 revisions imported

← Older revision		Revision as of 12:26, 4 July 2024
(No difference)

minecraft>Cook Me Plox: rebase dev changes onto prod

2023-09-24T16:26:29Z

rebase dev changes onto prod

← Older revision		Revision as of 16:26, 24 September 2023
Line 42:		Line 42:
	local styles = {}		local styles = {}

	~~if not setting( 'nourl' ) and setting( 'url' ) then~~		-- for tint
	~~styles[#styles + 1] = 'background~~-~~image:' .. ( setting( 'url' ).url or setting( 'url' ) )~~		local classname = setting( 'classname' ) or mw.ustring.lower( setting( 'name' ):gsub( ' ', '-' ) ) .. '-sprite'
	~~end~~		local css_image = "background"
	~~if setting( 'stylesheet' ) then~~		if setting( 'formask' ) then
	~~sprite:addClass(~~		classname = classname .. '-mask'
	setting( 'classname' ) or		css_image = "mask"
	mw.ustring.lower( setting( 'name' ):gsub( ' ', '-' ) ) .. '-sprite'
	)
	~~elseif not~~ setting( '~~url~~' ) then
	~~styles[#styles + 1]~~ = ~~'background-image:' .~~. p.~~getUrl(~~
	~~setting(~~ '~~image' ) or setting( 'name' ) .. 'Sprite.png~~'
	~~).url~~
	end		end

			sprite:addClass( classname )
	local class = setting( 'class' )		local class = setting( 'class' )
	if class then		if class then
Line 71:		Line 67:
	local left = pos % tiles * width * scale		local left = pos % tiles * width * scale
	local top = math.floor( pos / tiles ) * height * scale		local top = math.floor( pos / tiles ) * height * scale
	styles[#styles + 1] = '~~background~~-position:-' .. left .. 'px -' .. top .. 'px'		if css_image == 'mask' then
			styles[#styles + 1] = '-webkit-mask-position:-' .. left .. 'px -' .. top .. 'px'
			end
			styles[#styles + 1] = css_image .. '-position:-' .. left .. 'px -' .. top .. 'px'
	end		end

	if not autoScale and scale ~= defaultStyle.scale then		if not autoScale and scale ~= defaultStyle.scale then
	styles[#styles + 1] = '~~background~~-size:' .. sheetWidth * scale .. 'px auto'		if css_image == 'mask' then
			styles[#styles + 1] = '-webkit-mask-size:' .. sheetWidth * scale .. 'px auto'
			end
			styles[#styles + 1] = css_image .. '-size:' .. sheetWidth * scale .. 'px auto'
	end		end
	if height ~= defaultStyle.size or width ~= defaultStyle.size or ( not autoScale and scale ~= defaultStyle.scale ) then		if height ~= defaultStyle.size or width ~= defaultStyle.size or ( not autoScale and scale ~= defaultStyle.scale ) then
Line 184:		Line 186:

	return p.sprite( args )		return p.sprite( args )
	~~end~~

	~~function p.getUrl( image, query, classname )~~
	~~local f = mw.getCurrentFrame()~~
	~~local t = {~~
	~~url = f:expandTemplate{~~
	~~title = 'FileUrl',~~
	~~args = { image, query = query }~~
	},
	}
	~~if classname and classname ~= '' then~~
	~~t.style = f:expandTemplate{~~
	~~title = 'FileUrlStyle',~~
	~~args = { classname, image, query = query }~~
	}
	~~end~~
	~~return t~~
	~~end~~

	~~function p.getParsedUrlStyle( f )~~
	~~local args = f:getParent().args~~
	~~local module = args[1]~~
	~~return require( 'Module:' .. module ).settings.url.style~~
	end		end

Line 257:		Line 236:
	local dataTitle = mw.title.new( 'Module:' .. dataPage )		local dataTitle = mw.title.new( 'Module:' .. dataPage )
	-- Temporary until this is updated		-- Temporary until this is updated
	~~local classname = ''~~
	~~if data.settings.stylesheet then~~
	~~classname = data.settings.classname or~~
	~~mw.ustring.lower( data.settings.name:gsub( ' ', '-' ) ) .. '-sprite'~~
	~~end~~
	local spritesheet = data.settings.image or data.settings.name .. 'Sprite.png'		local spritesheet = data.settings.image or data.settings.name .. 'Sprite.png'
	local spriteTitle = mw.title.new( 'File:' .. spritesheet )		local spriteTitle = mw.title.new( 'File:' .. spritesheet )
Line 273:		Line 247:
	['data-spritesheet'] = spritesheet,		['data-spritesheet'] = spritesheet,
	['data-spriteprotection'] = spriteProtection,		['data-spriteprotection'] = spriteProtection,
	~~['data-urlfunc'] = "require( [[Module:Sprite]] ).getUrl( '" .. spritesheet .. "', '$1', '" .. classname .. "' )",~~
	['data-refreshtext'] = mw.text.nowiki( '{{#invoke:sprite\|doc\|' .. dataPage .. '\|refresh=1}}' ),		['data-refreshtext'] = mw.text.nowiki( '{{#invoke:sprite\|doc\|' .. dataPage .. '\|refresh=1}}' ),
	['data-settings'] = mw.text.jsonEncode( data.settings ),		['data-settings'] = mw.text.jsonEncode( data.settings ),
Line 324:		Line 297:
	return '', '', tostring( body )		return '', '', tostring( body )
	end		end
	local styles = f:~~callParserFunction~~( '~~#widget:SpriteDoc~~.css' )		local styles = f:extensionTag( 'templatestyles', '', { src = 'Sprite/doc.css' } )
	return styles, spriteStyle, tostring( body )		return styles, spriteStyle, tostring( body )
	end		end
	return p		return p

minecraft>AttemptToCallNil: Allow separate height and width

2021-07-29T23:09:04Z

Allow separate height and width

← Older revision		Revision as of 23:09, 29 July 2021
Line 60:		Line 60:
	end		end

	local size = setting( 'size' )		local width = setting( 'width' ) or setting( 'size' )
			local height = setting( 'height' ) or setting( 'size' )
	local sheetWidth = setting( 'sheetsize' )		local sheetWidth = setting( 'sheetsize' )
	local tiles = sheetWidth / ~~size~~		local tiles = sheetWidth / width
	local pos = setting( 'pos' ) - 1		local pos = setting( 'pos' ) - 1
	local scale = setting( 'scale' )		local scale = setting( 'scale' )
Line 68:		Line 69:

	if pos then		if pos then
	local left = pos % tiles * ~~size~~ * scale		local left = pos % tiles * width * scale
	local top = math.floor( pos / tiles ) * ~~size~~ * scale		local top = math.floor( pos / tiles ) * height * scale
	styles[#styles + 1] = 'background-position:-' .. left .. 'px -' .. top .. 'px'		styles[#styles + 1] = 'background-position:-' .. left .. 'px -' .. top .. 'px'
	end		end
Line 76:		Line 77:
	styles[#styles + 1] = 'background-size:' .. sheetWidth * scale .. 'px auto'		styles[#styles + 1] = 'background-size:' .. sheetWidth * scale .. 'px auto'
	end		end
	if size ~= defaultStyle.size or ( not autoScale and scale ~= defaultStyle.scale ) then		if height ~= defaultStyle.size or width ~= defaultStyle.size or ( not autoScale and scale ~= defaultStyle.scale ) then
	styles[#styles + 1] = 'height:' .. ~~size~~ * scale .. 'px'		styles[#styles + 1] = 'height:' .. height * scale .. 'px'
	styles[#styles + 1] = 'width:' .. ~~size~~ * scale .. 'px'		styles[#styles + 1] = 'width:' .. width * scale .. 'px'
	end		end

minecraft>Dhranios: Undo revision 1891074 by Dhranios (talk) didn't work

2021-03-24T17:37:33Z

Undo revision 1891074 by Dhranios (talk) didn't work

← Older revision		Revision as of 17:37, 24 March 2021
Line 272:		Line 272:
	['data-spritesheet'] = spritesheet,		['data-spritesheet'] = spritesheet,
	['data-spriteprotection'] = spriteProtection,		['data-spriteprotection'] = spriteProtection,
	['data-urlfunc'] = "require( [[Module:Sprite]] ).getUrl( '" .. spritesheet .. "', '$1~~&format=original~~', '" .. classname .. "' )",		['data-urlfunc'] = "require( [[Module:Sprite]] ).getUrl( '" .. spritesheet .. "', '$1', '" .. classname .. "' )",
	['data-refreshtext'] = mw.text.nowiki( '{{#invoke:sprite\|doc\|' .. dataPage .. '\|refresh=1}}' ),		['data-refreshtext'] = mw.text.nowiki( '{{#invoke:sprite\|doc\|' .. dataPage .. '\|refresh=1}}' ),
	['data-settings'] = mw.text.jsonEncode( data.settings ),		['data-settings'] = mw.text.jsonEncode( data.settings ),

minecraft>Dhranios: here goes nothing...

2021-03-24T17:36:38Z

here goes nothing...

← Older revision		Revision as of 17:36, 24 March 2021
Line 272:		Line 272:
	['data-spritesheet'] = spritesheet,		['data-spritesheet'] = spritesheet,
	['data-spriteprotection'] = spriteProtection,		['data-spriteprotection'] = spriteProtection,
	['data-urlfunc'] = "require( [[Module:Sprite]] ).getUrl( '" .. spritesheet .. "', '$1', '" .. classname .. "' )",		['data-urlfunc'] = "require( [[Module:Sprite]] ).getUrl( '" .. spritesheet .. "', '$1&format=original', '" .. classname .. "' )",
	['data-refreshtext'] = mw.text.nowiki( '{{#invoke:sprite\|doc\|' .. dataPage .. '\|refresh=1}}' ),		['data-refreshtext'] = mw.text.nowiki( '{{#invoke:sprite\|doc\|' .. dataPage .. '\|refresh=1}}' ),
	['data-settings'] = mw.text.jsonEncode( data.settings ),		['data-settings'] = mw.text.jsonEncode( data.settings ),

minecraft>AttemptToCallNil: Undo revision 1679649 by AttemptToCallNil (talk) need more testing

2020-09-05T17:32:01Z

Undo revision 1679649 by AttemptToCallNil (talk) need more testing

← Older revision		Revision as of 17:32, 5 September 2020
Line 298:		Line 298:
	end )		end )

	~~-- Reuse the same table in all iterations of the loop to avoid allocating~~
	~~-- many copies of basically the same table in every iteration.~~
	~~-- This seems to cut memory usage for the sprite doc by about 7% (tested on~~
	~~-- minecraft-ru); may not help with worse cases that hit the post-expand~~
	~~-- limit, or with Module:Documentation memory limits~~
	~~-- This works because the `base` function does not mutate the args table~~
	~~-- (which is an anti-pattern anyway, for reasons such as it prevents table~~
	~~-- reuse optimizations)~~
	~~local spriteArgs = { pos = 0, data = dataPage, nourl = spriteStyle ~= '' }~~
	for _, data in ipairs( keyedData ) do		for _, data in ipairs( keyedData ) do
	local idData = data.data		local idData = data.data
	local pos = idData.pos		local pos = idData.pos
	~~spriteArgs.pos = pos~~
	local section = sections[idData.section]		local section = sections[idData.section]
	local names = section[pos]		local names = section[pos]
Line 316:		Line 306:
	local box = section.boxes:tag( 'li' ):addClass( 'spritedoc-box' ):attr( 'data-pos', pos )		local box = section.boxes:tag( 'li' ):addClass( 'spritedoc-box' ):attr( 'data-pos', pos )
	box:tag( 'div' ):addClass( 'spritedoc-image' )		box:tag( 'div' ):addClass( 'spritedoc-image' )
	:wikitext( p.base~~(spriteArgs)~~ )		:wikitext( p.base{ pos = pos, data = dataPage, nourl = spriteStyle ~= '' } )

	names = box:tag( 'ul' ):addClass( 'spritedoc-names' )		names = box:tag( 'ul' ):addClass( 'spritedoc-names' )

minecraft>AttemptToCallNil: Porting an improvement I implemented on from minecraft-ru

2020-09-05T17:31:26Z

Porting an improvement I implemented on from minecraft-ru

← Older revision		Revision as of 17:31, 5 September 2020
Line 298:		Line 298:
	end )		end )

			-- Reuse the same table in all iterations of the loop to avoid allocating
			-- many copies of basically the same table in every iteration.
			-- This seems to cut memory usage for the sprite doc by about 7% (tested on
			-- minecraft-ru); may not help with worse cases that hit the post-expand
			-- limit, or with Module:Documentation memory limits
			-- This works because the `base` function does not mutate the args table
			-- (which is an anti-pattern anyway, for reasons such as it prevents table
			-- reuse optimizations)
			local spriteArgs = { pos = 0, data = dataPage, nourl = spriteStyle ~= '' }
	for _, data in ipairs( keyedData ) do		for _, data in ipairs( keyedData ) do
	local idData = data.data		local idData = data.data
	local pos = idData.pos		local pos = idData.pos
			spriteArgs.pos = pos
	local section = sections[idData.section]		local section = sections[idData.section]
	local names = section[pos]		local names = section[pos]
Line 306:		Line 316:
	local box = section.boxes:tag( 'li' ):addClass( 'spritedoc-box' ):attr( 'data-pos', pos )		local box = section.boxes:tag( 'li' ):addClass( 'spritedoc-box' ):attr( 'data-pos', pos )
	box:tag( 'div' ):addClass( 'spritedoc-image' )		box:tag( 'div' ):addClass( 'spritedoc-image' )
	:wikitext( p.base~~{ pos = pos, data = dataPage, nourl = spriteStyle ~= '' }~~ )		:wikitext( p.base(spriteArgs) )

	names = box:tag( 'ul' ):addClass( 'spritedoc-names' )		names = box:tag( 'ul' ):addClass( 'spritedoc-names' )

minecraft>MarkusRost: Revert edits by MarkusRost (talk): Accidentally broke something

2020-05-09T14:10:41Z

Revert edits by MarkusRost (talk): Accidentally broke something

← Older revision		Revision as of 14:10, 9 May 2020
Line 42:		Line 42:
	local styles = {}		local styles = {}

	if not setting( 'nourl' ) and setting( 'url' ) ~~and not setting( 'url' ).style~~ then		if not setting( 'nourl' ) and setting( 'url' ) then
	styles[#styles + 1] = 'background-image:' .. ( setting( 'url' ).url or setting( 'url' ) )		styles[#styles + 1] = 'background-image:' .. ( setting( 'url' ).url or setting( 'url' ) )
	end		end

minecraft>MarkusRost: Remove inline background image for sprites with defined class

2020-05-09T14:08:31Z

Remove inline background image for sprites with defined class

← Older revision		Revision as of 14:08, 9 May 2020
Line 42:		Line 42:
	local styles = {}		local styles = {}

	if not setting( 'nourl' ) and setting( 'url' ) then		if not setting( 'nourl' ) and setting( 'url' ) and not setting( 'url' ).style then
	styles[#styles + 1] = 'background-image:' .. ( setting( 'url' ).url or setting( 'url' ) )		styles[#styles + 1] = 'background-image:' .. ( setting( 'url' ).url or setting( 'url' ) )
	end		end

minecraft>Nixinova: Add "wrap" arg to wrap text

2020-04-18T20:32:40Z

Add "wrap" arg to wrap text

← Older revision		Revision as of 20:32, 18 April 2020
Line 93:		Line 93:
	local spriteText		local spriteText
	if text then		if text then
	root = mw.html.create( 'span' ):addClass( 'nowrap' )		if not args['wrap'] then
			root = mw.html.create( 'span' ):addClass( 'nowrap' )
			end
	spriteText = mw.html.create( 'span' ):addClass( 'sprite-text' ):wikitext( text )		spriteText = mw.html.create( 'span' ):addClass( 'sprite-text' ):wikitext( text )
	end		end