Skip to content

Commit e3f5193

Browse files
authored
Merge pull request #226 from JerichoR/Fix11.2
Fix several Lua errors of patch 11.2
2 parents 2ac5d7e + 5d5ed4f commit e3f5193

2 files changed

Lines changed: 15 additions & 13 deletions

File tree

Tukui/Modules/Miscellaneous/LossControl.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ function LossControl:Update()
2828
end
2929

3030
function LossControl:AddHooks()
31-
hooksecurefunc("LossOfControlFrame_SetUpDisplay", self.Update)
31+
hooksecurefunc(LossOfControlFrame, "SetUpDisplay", self.Update)
3232
end
3333

3434
function LossControl:Enable()
@@ -44,4 +44,4 @@ function LossControl:Enable()
4444
self:AddHooks()
4545
end
4646

47-
Miscellaneous.LossControl = LossControl
47+
Miscellaneous.LossControl = LossControl

Tukui/Modules/Miscellaneous/StaticPopups.lua

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ StaticPopups.Popups = {
1313
function StaticPopups:Skin()
1414
local Name = self:GetName()
1515

16-
if T.Retail then
17-
_G[Name].Border:SetAlpha(0)
18-
end
16+
-- if T.Retail then
17+
-- _G[Name].Border:SetAlpha(0)
18+
-- end
1919

2020
_G[Name]:StripTextures()
2121
_G[Name]:CreateBackdrop("Transparent")
@@ -40,14 +40,16 @@ function StaticPopups:Skin()
4040
_G[Name.."MoneyInputFrameCopper"].Backdrop:SetBackdropBorderColor(0, 0, 0, 0)
4141
_G[Name.."EditBox"].Backdrop:SetPoint("TOPLEFT", -2, -4)
4242
_G[Name.."EditBox"].Backdrop:SetPoint("BOTTOMRIGHT", 2, 4)
43-
_G[Name.."ItemFrameNameFrame"]:Kill()
44-
_G[Name.."ItemFrame"]:GetNormalTexture():Kill()
45-
_G[Name.."ItemFrame"]:CreateBackdrop("Default")
46-
_G[Name.."ItemFrame"]:StyleButton()
47-
_G[Name.."ItemFrameIconTexture"]:SetTexCoord(.08, .92, .08, .92)
48-
_G[Name.."ItemFrameIconTexture"]:ClearAllPoints()
49-
_G[Name.."ItemFrameIconTexture"]:SetPoint("TOPLEFT", 2, -2)
50-
_G[Name.."ItemFrameIconTexture"]:SetPoint("BOTTOMRIGHT", -2, 2)
43+
if not T.Retail then -- these dont work in retail anymore, don't know if needed for other versions
44+
_G[Name.."ItemFrameNameFrame"]:Kill()
45+
_G[Name.."ItemFrame"]:GetNormalTexture():Kill()
46+
_G[Name.."ItemFrame"]:CreateBackdrop("Default")
47+
_G[Name.."ItemFrame"]:StyleButton()
48+
_G[Name.."ItemFrameIconTexture"]:SetTexCoord(.08, .92, .08, .92)
49+
_G[Name.."ItemFrameIconTexture"]:ClearAllPoints()
50+
_G[Name.."ItemFrameIconTexture"]:SetPoint("TOPLEFT", 2, -2)
51+
_G[Name.."ItemFrameIconTexture"]:SetPoint("BOTTOMRIGHT", -2, 2)
52+
end
5153
_G[Name.."CloseButton"]:SkinCloseButton()
5254
_G[Name.."CloseButton"].SetNormalTexture = function() end
5355
_G[Name.."CloseButton"].SetPushedTexture = function() end

0 commit comments

Comments
 (0)