This commit is contained in:
Bunny67
2017-12-31 03:38:51 +03:00
parent f5b845f338
commit 8b07ab014f
5 changed files with 10 additions and 21 deletions
+2 -2
View File
@@ -972,7 +972,7 @@ function E:InitializeInitialModules()
module = self:GetModule(module, true) module = self:GetModule(module, true)
if(module and module.Initialize) then if(module and module.Initialize) then
local _, catch = pcall(module.Initialize, module) local _, catch = pcall(module.Initialize, module)
--if(catch and GetCVarBool("scriptErrors") == "1") then --if(catch and GetCVarBool("ShowErrors") == "1") then
ScriptErrorsFrame_OnError(catch, false) ScriptErrorsFrame_OnError(catch, false)
--end --end
end end
@@ -998,7 +998,7 @@ function E:InitializeModules()
module = self:GetModule(module) module = self:GetModule(module)
if(module.Initialize) then if(module.Initialize) then
local _, catch = pcall(module.Initialize, module) local _, catch = pcall(module.Initialize, module)
--if(catch and GetCVarBool("scriptErrors") == "1") then --if(catch and GetCVarBool("ShowErrors") == "1") then
ScriptErrorsFrame_OnError(catch, false) ScriptErrorsFrame_OnError(catch, false)
--end --end
end end
-3
View File
@@ -1,6 +1,3 @@
--Cache global variables
local pairs, unpack = pairs, unpack
BINDING_HEADER_ELVUI = GetAddOnMetadata("ElvUI", "Title") BINDING_HEADER_ELVUI = GetAddOnMetadata("ElvUI", "Title")
local AddOnName, Engine = "ElvUI", {} local AddOnName, Engine = "ElvUI", {}
@@ -4,7 +4,6 @@ local DT = E:GetModule("DataTexts");
--Cache global variables --Cache global variables
--Lua functions --Lua functions
local collectgarbage = collectgarbage local collectgarbage = collectgarbage
local sort, wipe = table.sort, wipe
local floor = math.floor local floor = math.floor
local format = string.format local format = string.format
local gcinfo = gcinfo local gcinfo = gcinfo
@@ -12,7 +11,7 @@ local gcinfo = gcinfo
local GetNetStats = GetNetStats local GetNetStats = GetNetStats
local GetFramerate = GetFramerate local GetFramerate = GetFramerate
local int, int2 = 6, 5 local int = 6
local statusColors = { local statusColors = {
"|cff0CD809", "|cff0CD809",
"|cffE8DA0F", "|cffE8DA0F",
@@ -5,7 +5,6 @@ local S = E:GetModule("Skins");
--Lua functions --Lua functions
local _G = _G local _G = _G
local unpack = unpack local unpack = unpack
local getn = table.getn
--WoW API / Variables --WoW API / Variables
local function LoadSkin() local function LoadSkin()
@@ -42,18 +41,12 @@ local function LoadSkin()
button:GetNormalTexture():SetTexture("") button:GetNormalTexture():SetTexture("")
button:GetPushedTexture():SetTexture("") button:GetPushedTexture():SetTexture("")
if iconTexture then E:CreateBackdrop(button, "Default", true)
iconTexture:SetTexCoord(unpack(E.TexCoords)) iconTexture:SetTexCoord(unpack(E.TexCoords))
if not button.backdrop then
E:CreateBackdrop(button, "Default", true)
end
end
if cooldown then
E:RegisterCooldown(cooldown) E:RegisterCooldown(cooldown)
end end
end
hooksecurefunc("SpellButton_UpdateButton", function() hooksecurefunc("SpellButton_UpdateButton", function()
local name = this:GetName() local name = this:GetName()
@@ -75,9 +68,9 @@ local function LoadSkin()
for i = 1, MAX_SKILLLINE_TABS do for i = 1, MAX_SKILLLINE_TABS do
local tab = _G["SpellBookSkillLineTab"..i] local tab = _G["SpellBookSkillLineTab"..i]
E:StripTextures(tab) tab:DisableDrawLayer("BACKGROUND")
E:StyleButton(tab, nil, true)
E:SetTemplate(tab, "Default", true) E:SetTemplate(tab, "Default", true)
E:StyleButton(tab, nil, true)
tab:GetNormalTexture():SetTexCoord(unpack(E.TexCoords)) tab:GetNormalTexture():SetTexCoord(unpack(E.TexCoords))
E:SetInside(tab:GetNormalTexture()) E:SetInside(tab:GetNormalTexture())
+2 -2
View File
@@ -571,7 +571,7 @@ function S:Initialize()
if IsAddOnLoaded(addon) then if IsAddOnLoaded(addon) then
self.addonsToLoad[addon] = nil self.addonsToLoad[addon] = nil
local _, catch = pcall(loadFunc) local _, catch = pcall(loadFunc)
if catch and GetCVarBool("scriptErrors") == "1" then if catch and GetCVarBool("ShowErrors") == "1" then
ScriptErrorsFrame_OnError(catch, false) ScriptErrorsFrame_OnError(catch, false)
end end
end end
@@ -579,7 +579,7 @@ function S:Initialize()
for _, loadFunc in pairs(self.nonAddonsToLoad) do for _, loadFunc in pairs(self.nonAddonsToLoad) do
local _, catch = pcall(loadFunc) local _, catch = pcall(loadFunc)
if catch and GetCVarBool("scriptErrors") == "1" then if catch and GetCVarBool("ShowErrors") == "1" then
ScriptErrorsFrame_OnError(catch, false) ScriptErrorsFrame_OnError(catch, false)
end end
end end