From 8b07ab014fb0e444f944080ca9f03b7350cb7768 Mon Sep 17 00:00:00 2001
From: Bunny67 <zolov67@yandex.ru>
Date: Sun, 31 Dec 2017 03:38:51 +0300
Subject: [PATCH] 1

---
 2/3/4/5/6/7/ElvUI/Core/core.lua                 |  4 ++--
 2/3/4/5/6/7/ElvUI/Init.lua                      |  3 ---
 2/3/4/5/6/7/ElvUI/Modules/DataTexts/System.lua  |  3 +--
 .../ElvUI/Modules/Skins/Blizzard/SpellBook.lua  | 17 +++++------------
 2/3/4/5/6/7/ElvUI/Modules/Skins/Skins.lua       |  4 ++--
 5 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/2/3/4/5/6/7/ElvUI/Core/core.lua b/2/3/4/5/6/7/ElvUI/Core/core.lua
index e5df946..8453e91 100644
--- a/2/3/4/5/6/7/ElvUI/Core/core.lua
+++ b/2/3/4/5/6/7/ElvUI/Core/core.lua
@@ -972,7 +972,7 @@ function E:InitializeInitialModules()
 		module = self:GetModule(module, true)
 		if(module and module.Initialize) then
 			local _, catch = pcall(module.Initialize, module)
-			--if(catch and GetCVarBool("scriptErrors") == "1") then
+			--if(catch and GetCVarBool("ShowErrors") == "1") then
 				ScriptErrorsFrame_OnError(catch, false)
 			--end
 		end
@@ -998,7 +998,7 @@ function E:InitializeModules()
 		module = self:GetModule(module)
 		if(module.Initialize) then
 			local _, catch = pcall(module.Initialize, module)
-			--if(catch and GetCVarBool("scriptErrors") == "1") then
+			--if(catch and GetCVarBool("ShowErrors") == "1") then
 				ScriptErrorsFrame_OnError(catch, false)
 			--end
 		end
diff --git a/2/3/4/5/6/7/ElvUI/Init.lua b/2/3/4/5/6/7/ElvUI/Init.lua
index 1a03ed8..54d2e41 100644
--- a/2/3/4/5/6/7/ElvUI/Init.lua
+++ b/2/3/4/5/6/7/ElvUI/Init.lua
@@ -1,6 +1,3 @@
---Cache global variables
-local pairs, unpack = pairs, unpack
-
 BINDING_HEADER_ELVUI = GetAddOnMetadata("ElvUI", "Title")
 
 local AddOnName, Engine = "ElvUI", {}
diff --git a/2/3/4/5/6/7/ElvUI/Modules/DataTexts/System.lua b/2/3/4/5/6/7/ElvUI/Modules/DataTexts/System.lua
index f2ae76f..9344c39 100644
--- a/2/3/4/5/6/7/ElvUI/Modules/DataTexts/System.lua
+++ b/2/3/4/5/6/7/ElvUI/Modules/DataTexts/System.lua
@@ -4,7 +4,6 @@ local DT = E:GetModule("DataTexts");
 --Cache global variables
 --Lua functions
 local collectgarbage = collectgarbage
-local sort, wipe = table.sort, wipe
 local floor = math.floor
 local format = string.format
 local gcinfo = gcinfo
@@ -12,7 +11,7 @@ local gcinfo = gcinfo
 local GetNetStats = GetNetStats
 local GetFramerate = GetFramerate
 
-local int, int2 = 6, 5
+local int = 6
 local statusColors = {
 	"|cff0CD809",
 	"|cffE8DA0F",
diff --git a/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/SpellBook.lua b/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/SpellBook.lua
index 1d1c816..e8abcc9 100644
--- a/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/SpellBook.lua
+++ b/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/SpellBook.lua
@@ -5,7 +5,6 @@ local S = E:GetModule("Skins");
 --Lua functions
 local _G = _G
 local unpack = unpack
-local getn = table.getn
 --WoW API / Variables
 
 local function LoadSkin()
@@ -42,17 +41,11 @@ local function LoadSkin()
 		button:GetNormalTexture():SetTexture("")
 		button:GetPushedTexture():SetTexture("")
 
-		if iconTexture then
-			iconTexture:SetTexCoord(unpack(E.TexCoords))
+		E:CreateBackdrop(button, "Default", true)
 
-			if not button.backdrop then
-				E:CreateBackdrop(button, "Default", true)
-			end
-		end
+		iconTexture:SetTexCoord(unpack(E.TexCoords))
 
-		if cooldown then
-			E:RegisterCooldown(cooldown)
-		end
+		E:RegisterCooldown(cooldown)
 	end
 
 	hooksecurefunc("SpellButton_UpdateButton", function()
@@ -75,9 +68,9 @@ local function LoadSkin()
 	for i = 1, MAX_SKILLLINE_TABS do
 		local tab = _G["SpellBookSkillLineTab"..i]
 
-		E:StripTextures(tab)
-		E:StyleButton(tab, nil, true)
+		tab:DisableDrawLayer("BACKGROUND")
 		E:SetTemplate(tab, "Default", true)
+		E:StyleButton(tab, nil, true)
 
 		tab:GetNormalTexture():SetTexCoord(unpack(E.TexCoords))
 		E:SetInside(tab:GetNormalTexture())
diff --git a/2/3/4/5/6/7/ElvUI/Modules/Skins/Skins.lua b/2/3/4/5/6/7/ElvUI/Modules/Skins/Skins.lua
index df98bc7..9e6b956 100644
--- a/2/3/4/5/6/7/ElvUI/Modules/Skins/Skins.lua
+++ b/2/3/4/5/6/7/ElvUI/Modules/Skins/Skins.lua
@@ -571,7 +571,7 @@ function S:Initialize()
 		if IsAddOnLoaded(addon) then
 			self.addonsToLoad[addon] = nil
 			local _, catch = pcall(loadFunc)
-			if catch and GetCVarBool("scriptErrors") == "1" then
+			if catch and GetCVarBool("ShowErrors") == "1" then
 				ScriptErrorsFrame_OnError(catch, false)
 			end
 		end
@@ -579,7 +579,7 @@ function S:Initialize()
 
 	for _, loadFunc in pairs(self.nonAddonsToLoad) do
 		local _, catch = pcall(loadFunc)
-		if catch and GetCVarBool("scriptErrors") == "1" then
+		if catch and GetCVarBool("ShowErrors") == "1" then
 			ScriptErrorsFrame_OnError(catch, false)
 		end
 	end