Skip to content

Commit 7af4cef

Browse files
committed
4.73
1 parent c541287 commit 7af4cef

File tree

7 files changed

+47
-60
lines changed

7 files changed

+47
-60
lines changed

AddOnSkins/AddOnSkins.toc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## Interface: 110002
22
## Title: |cff16C3F2AddOn|r|cFFFFFFFFSkins|r
3-
## Version: 4.72
3+
## Version: 4.73
44
## Author: Azilroka, Nihilistzsche
55
## SavedVariables: AddOnSkinsDB, AddOnSkinsDS
66
## OptionalDeps: AllTheThings, ElvUI

AddOnSkins/AddOnSkins_Cata.toc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## Interface: 40400
22
## Title: |cff16C3F2AddOn|r|cFFFFFFFFSkins|r
3-
## Version: 4.72
3+
## Version: 4.73
44
## Author: Azilroka, Nihilistzsche
55
## SavedVariables: AddOnSkinsDB, AddOnSkinsDS
66
## OptionalDeps: AllTheThings, ElvUI

AddOnSkins/AddOnSkins_Classic.toc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## Interface: 11503
22
## Title: |cff16C3F2AddOn|r|cFFFFFFFFSkins|r
3-
## Version: 4.72
3+
## Version: 4.73
44
## Author: Azilroka, Nihilistzsche
55
## SavedVariables: AddOnSkinsDB, AddOnSkinsDS
66
## OptionalDeps: AllTheThings, ElvUI

AddOnSkins/Core/API.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
local AS = unpack(AddOnSkins)
1+
local AS = unpack(_G.AddOnSkins)
22
local S = AS.Skins
33

44
-- Deprecated - Moved to Skins Module

AddOnSkins/Core/Core.lua

+3-5
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@ local AddOnName = ...
66
local ES = AS.EmbedSystem
77

88
local _G = _G
9-
local pairs, ipairs, type, pcall = pairs, ipairs, type, pcall
9+
local pairs, ipairs, type, pcall, tinsert = pairs, ipairs, type, pcall, tinsert
1010
local floor, print, format, strlower, strmatch, strlen = floor, print, format, strlower, strmatch, strlen
11-
local sort, tinsert = sort, tinsert
1211

1312
local geterrorhandler = geterrorhandler
1413
local IsAddOnLoaded, C_Timer = C_AddOns.IsAddOnLoaded, C_Timer
@@ -38,8 +37,7 @@ function AS:IsSkinEnabled(name, elvName)
3837
end
3938

4039
function AS:GetColor(name)
41-
local color = '|cff1784d1%s|r'
42-
return (color):format(name)
40+
return format('|cff1784d1%s|r', name)
4341
end
4442

4543
function AS:RGBToHex(r, g, b, header)
@@ -200,7 +198,7 @@ function AS:UnregisterSkinEvent(addonName, event)
200198
end
201199

202200
function AS:UpdateMedia()
203-
AS.Blank = AS.Libs.LSM:Fetch('background', 'Solid')
201+
AS.Blank = AS.Libs.LSM:Fetch('statusbar', 'Solid')
204202
AS.Font = AS.Libs.LSM:Fetch('font', "Friz Quadrata TT")
205203
AS.PixelFont = AS.Libs.LSM:Fetch('font', "Arial Narrow")
206204
AS.NormTex = AS.Libs.LSM:Fetch('statusbar', "Blizzard")

AddOnSkins/Init.lua

+22-40
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,34 @@
11
local _G = _G
2-
local format = format
3-
local strlower = strlower
4-
local CreateFrame = CreateFrame
5-
local GetAddOnEnableState = C_AddOns.GetAddOnEnableState
6-
local GetAddOnInfo = C_AddOns.GetAddOnInfo
7-
local GetAddOnMetadata = C_AddOns.GetAddOnMetadata
8-
local GetNumAddOns = C_AddOns.GetNumAddOns
9-
local GetRealmName = GetRealmName
10-
local UIParent = UIParent
11-
local UnitClass = UnitClass
12-
local UnitName = UnitName
13-
local UnitFactionGroup = UnitFactionGroup
2+
local format, strlower = format, strlower
3+
4+
local GetAddOnEnableState, GetAddOnInfo, GetAddOnMetadata, GetNumAddOns = C_AddOns.GetAddOnEnableState, C_AddOns.GetAddOnInfo, C_AddOns.GetAddOnMetadata, C_AddOns.GetNumAddOns
5+
local UnitName, GetRealmName, UnitClass, UnitFactionGroup = UnitName, GetRealmName, UnitClass, UnitFactionGroup
6+
7+
local UIParent, CreateFrame = UIParent, CreateFrame
8+
local LibStub = _G.LibStub
149

1510
local AddOnName, Engine = ...
16-
local AS = _G.LibStub('AceAddon-3.0'):NewAddon('AddOnSkins', 'AceConsole-3.0', 'AceEvent-3.0', 'AceHook-3.0', 'AceTimer-3.0')
17-
local _
11+
local AS, _ = LibStub('AceAddon-3.0'):NewAddon('AddOnSkins', 'AceConsole-3.0', 'AceEvent-3.0', 'AceHook-3.0', 'AceTimer-3.0')
1812

1913
AS.EmbedSystem = AS:NewModule('EmbedSystem', 'AceEvent-3.0', 'AceHook-3.0')
2014
AS.Skins = AS:NewModule('Skins', 'AceTimer-3.0', 'AceHook-3.0', 'AceEvent-3.0')
2115

22-
Engine[1] = AS
23-
Engine[2] = {}
24-
Engine[3] = AS.Skins
25-
Engine[4] = {}
16+
_G.AddOnSkins, Engine[1], Engine[2], Engine[3], Engine[4], _G.AddOnSkinsDS = Engine, AS, {}, AS.Skins, {}, {}
2617

27-
_G.AddOnSkins = Engine
28-
_G.AddOnSkinsDS = {}
29-
30-
AS.Classic = WOW_PROJECT_ID == WOW_PROJECT_CLASSIC
31-
AS.Retail = WOW_PROJECT_ID == WOW_PROJECT_MAINLINE
32-
AS.TBC = WOW_PROJECT_ID == WOW_PROJECT_BURNING_CRUSADE_CLASSIC
33-
AS.Wrath = WOW_PROJECT_ID == WOW_PROJECT_WRATH_CLASSIC
18+
AS.Retail, AS.Classic, AS.TBC, AS.Wrath = WOW_PROJECT_ID == WOW_PROJECT_MAINLINE, WOW_PROJECT_ID == WOW_PROJECT_CLASSIC, WOW_PROJECT_ID == WOW_PROJECT_BURNING_CRUSADE_CLASSIC, WOW_PROJECT_ID == WOW_PROJECT_WRATH_CLASSIC
3419

3520
AS.Libs = {
36-
AC = _G.LibStub('AceConfig-3.0'),
37-
ACD = _G.LibStub('AceConfigDialog-3.0-ElvUI', true) or _G.LibStub('AceConfigDialog-3.0'),
38-
ACH = _G.LibStub('LibAceConfigHelper'),
39-
ADB = _G.LibStub('AceDB-3.0'),
40-
ADBO = _G.LibStub('AceDBOptions-3.0'),
41-
ACL = _G.LibStub("AceLocale-3.0-ElvUI", true) or _G.LibStub("AceLocale-3.0"),
42-
EP = _G.LibStub('LibElvUIPlugin-1.0', true),
43-
ACR = _G.LibStub('AceConfigRegistry-3.0'),
44-
GUI = _G.LibStub('AceGUI-3.0'),
45-
LCG = _G.LibStub('LibCustomGlow-1.0', true),
46-
LSM = _G.LibStub('LibSharedMedia-3.0', true),
21+
AC = LibStub('AceConfig-3.0'),
22+
ACD = LibStub('AceConfigDialog-3.0-ElvUI', true) or LibStub('AceConfigDialog-3.0'),
23+
ACH = LibStub('LibAceConfigHelper'),
24+
ADB = LibStub('AceDB-3.0'),
25+
ADBO = LibStub('AceDBOptions-3.0'),
26+
ACL = LibStub("AceLocale-3.0-ElvUI", true) or LibStub("AceLocale-3.0"),
27+
EP = LibStub('LibElvUIPlugin-1.0', true),
28+
ACR = LibStub('AceConfigRegistry-3.0'),
29+
GUI = LibStub('AceGUI-3.0'),
30+
LCG = LibStub('LibCustomGlow-1.0', true),
31+
LSM = LibStub('LibSharedMedia-3.0', true),
4732
}
4833

4934
AS.Title = GetAddOnMetadata(AddOnName, 'Title')
@@ -55,9 +40,8 @@ _, AS.MyClass = UnitClass('player')
5540
AS.MyName = UnitName('player')
5641
AS.MyRealm = GetRealmName()
5742
AS.Noop = function() end
58-
AS.TexCoords = { .075, .925, .075, .925 }
43+
AS.TexCoords = { .08, .92, .08, .92 }
5944
AS.Faction = UnitFactionGroup('player')
60-
AS.Debug = false
6145

6246
AS.preload = {}
6347
AS.skins = {}
@@ -73,7 +57,5 @@ for i = 1, GetNumAddOns() do
7357
AS.AddOnVersion[strlower(Name)] = GetAddOnMetadata(Name, 'Version')
7458
end
7559

76-
AS.Libs.LSM:Register('statusbar', 'Solid', [[Interface\Buttons\WHITE8X8]])
77-
7860
AS.Hider = CreateFrame('Frame', nil, UIParent)
7961
AS.Hider:Hide()

AddOnSkins/Libs/LibSharedMedia-3.0/LibSharedMedia-3.0.lua

+18-11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
--@curseforge-project-slug: libsharedmedia-3-0@
12
--[[
23
Name: LibSharedMedia-3.0
3-
Revision: $Revision: 91 $
4+
Revision: $Revision: 151 $
45
Author: Elkano ([email protected])
56
Inspired By: SurfaceLib by Haste/Otravi ([email protected])
67
Website: http://www.wowace.com/projects/libsharedmedia-3-0/
@@ -9,7 +10,7 @@ Dependencies: LibStub, CallbackHandler-1.0
910
License: LGPL v2.1
1011
]]
1112

12-
local MAJOR, MINOR = "LibSharedMedia-3.0", 6010002 -- 6.1.0 v2 / increase manually on changes
13+
local MAJOR, MINOR = "LibSharedMedia-3.0", 8020003 -- 8.2.0 v3 / increase manually on changes
1314
local lib = LibStub:NewLibrary(MAJOR, MINOR)
1415

1516
if not lib then return end
@@ -20,13 +21,11 @@ local pairs = _G.pairs
2021
local type = _G.type
2122

2223
local band = _G.bit.band
23-
24-
local table_insert = _G.table.insert
2524
local table_sort = _G.table.sort
2625

2726
local locale = GetLocale()
2827
local locale_is_western
29-
local LOCALE_MASK = 0
28+
local LOCALE_MASK
3029
lib.LOCALE_BIT_koKR = 1
3130
lib.LOCALE_BIT_ruRU = 2
3231
lib.LOCALE_BIT_zhCN = 4
@@ -193,11 +192,12 @@ if not lib.MediaTable.statusbar then lib.MediaTable.statusbar = {} end
193192
lib.MediaTable.statusbar["Blizzard"] = [[Interface\TargetingFrame\UI-StatusBar]]
194193
lib.MediaTable.statusbar["Blizzard Character Skills Bar"] = [[Interface\PaperDollInfoFrame\UI-Character-Skills-Bar]]
195194
lib.MediaTable.statusbar["Blizzard Raid Bar"] = [[Interface\RaidFrame\Raid-Bar-Hp-Fill]]
195+
lib.MediaTable.statusbar["Solid"] = [[Interface\Buttons\WHITE8X8]]
196196
lib.DefaultMedia.statusbar = "Blizzard"
197197

198198
-- SOUND
199199
if not lib.MediaTable.sound then lib.MediaTable.sound = {} end
200-
lib.MediaTable.sound["None"] = [[Interface\Quiet.ogg]] -- Relies on the fact that PlaySound[File] doesn't error on non-existing input.
200+
lib.MediaTable.sound["None"] = 1 -- Relies on the fact that PlaySoundFile doesn't error on this value
201201
lib.DefaultMedia.sound = "None"
202202

203203
local function rebuildMediaList(mediatype)
@@ -222,18 +222,25 @@ function lib:Register(mediatype, key, data, langmask)
222222
error(MAJOR..":Register(mediatype, key, data, langmask) - key must be string, got "..type(key))
223223
end
224224
mediatype = mediatype:lower()
225-
if mediatype == lib.MediaType.FONT and ((langmask and band(langmask, LOCALE_MASK) == 0) or not (langmask or locale_is_western)) then return false end
226-
if mediatype == lib.MediaType.SOUND and type(data) == "string" then
225+
if mediatype == lib.MediaType.FONT and ((langmask and band(langmask, LOCALE_MASK) == 0) or not (langmask or locale_is_western)) then
226+
-- ignore fonts that aren't flagged as supporting local glyphs on non-western clients
227+
return false
228+
end
229+
if type(data) == "string" and (mediatype == lib.MediaType.BACKGROUND or mediatype == lib.MediaType.BORDER or mediatype == lib.MediaType.STATUSBAR or mediatype == lib.MediaType.SOUND) then
227230
local path = data:lower()
228-
-- Only ogg and mp3 are valid sounds.
229-
if not path:find(".ogg", nil, true) and not path:find(".mp3", nil, true) then
231+
if not path:find("^interface") then
232+
-- files accessed via path only allowed from interface folder
233+
return false
234+
end
235+
if mediatype == lib.MediaType.SOUND and not (path:find(".ogg", nil, true) or path:find(".mp3", nil, true)) then
236+
-- Only ogg and mp3 are valid sounds.
230237
return false
231238
end
232239
end
233240
if not mediaTable[mediatype] then mediaTable[mediatype] = {} end
234241
local mtable = mediaTable[mediatype]
235242
if mtable[key] then return false end
236-
243+
237244
mtable[key] = data
238245
rebuildMediaList(mediatype)
239246
self.callbacks:Fire("LibSharedMedia_Registered", mediatype, key)

0 commit comments

Comments
 (0)