update

ElvUI-TBC · Jan 5, 2019 · 55fbfc4 · 55fbfc4
1 parent 65f0453
commit 55fbfc4
Show file tree

Hide file tree

Showing 19 changed files with 226 additions and 271 deletions.
diff --git a/ElvUI/core/cooldowns.lua b/ElvUI/core/cooldowns.lua
@@ -1,4 +1,5 @@
 local E, L, V, P, G = unpack(ElvUI)
+local LSM = E.LSM
 
 local next, ipairs, pairs = next, ipairs, pairs
 local floor = math.floor
@@ -60,7 +61,7 @@ function E:Cooldown_OnSizeChanged(cd, parent, width, force)
 	else
 		local text = cd.text or cd.time
 		if text then
-			local useCustomFont = (cd.timerOptions and cd.timerOptions.fontOptions and cd.timerOptions.fontOptions.enable) and E.LSM:Fetch("font", cd.timerOptions.fontOptions.font)
+			local useCustomFont = (cd.timerOptions and cd.timerOptions.fontOptions and cd.timerOptions.fontOptions.enable) and LSM:Fetch("font", cd.timerOptions.fontOptions.font)
 			if useCustomFont then
 				local customSize = (parent and parent.CooldownFontSize and cd.timerOptions.fontOptions.fontSize) or (fontScale * cd.timerOptions.fontOptions.fontSize)
 				text:FontTemplate(useCustomFont, customSize, cd.timerOptions.fontOptions.fontOutline)
@@ -254,14 +255,14 @@ function E:UpdateCooldownOverride(module)
 				if text then
 					if CD.timerOptions.fontOptions and CD.timerOptions.fontOptions.enable then
 						if not customFont then
-							customFont = E.LSM:Fetch("font", CD.timerOptions.fontOptions.font)
+							customFont = LSM:Fetch("font", CD.timerOptions.fontOptions.font)
 						end
 						if customFont then
 							text:FontTemplate(customFont, CD.timerOptions.fontOptions.fontSize, CD.timerOptions.fontOptions.fontOutline)
 						end
 					elseif cd.CooldownOverride then
 						if not customFont then
-							customFont = E.LSM:Fetch("font", E.db[cd.CooldownOverride].font)
+							customFont = LSM:Fetch("font", E.db[cd.CooldownOverride].font)
 						end
 						if customFont then
 							-- cd.auraType defined in `A:UpdateHeader` and `A:CreateIcon`

diff --git a/ElvUI/core/core.lua b/ElvUI/core/core.lua
@@ -527,12 +527,10 @@ end
 function E:CheckIncompatible()
 	if E.global.ignoreIncompatible then return end
 
---[[
 	if IsAddOnLoaded("SnowfallKeyPress") and E.private.actionbar.enable then
 		E.private.actionbar.keyDown = true
 		E:IncompatibleAddOn("SnowfallKeyPress", "ActionBar")
 	end
-]]
 
 	if IsAddOnLoaded("Chatter") and E.private.chat.enable then
 		E:IncompatibleAddOn("Chatter", "Chat")

diff --git a/ElvUI/layout/layout.lua b/ElvUI/layout/layout.lua
@@ -1,5 +1,6 @@
 local E, L, V, P, G = unpack(ElvUI)
 local LO = E:NewModule("Layout", "AceEvent-3.0")
+local LSM = E.LSM
 
 local CreateFrame = CreateFrame
 local UIFrameFadeIn, UIFrameFadeOut = UIFrameFadeIn, UIFrameFadeOut
@@ -438,7 +439,7 @@ function LO:CreateMinimapPanels()
 	configtoggle:Width(E.RBRWidth)
 	configtoggle:SetTemplate(E.db.datatexts.panelTransparency and "Transparent" or "Default", true)
 	configtoggle.text = configtoggle:CreateFontString(nil, "OVERLAY")
-	configtoggle.text:FontTemplate(E.LSM:Fetch("font", E.db.datatexts.font), E.db.datatexts.fontSize, E.db.datatexts.fontOutline)
+	configtoggle.text:FontTemplate(LSM:Fetch("font", E.db.datatexts.font), E.db.datatexts.fontSize, E.db.datatexts.fontOutline)
 	configtoggle.text:SetText("C")
 	configtoggle.text:SetPoint("CENTER")
 	configtoggle.text:SetJustifyH("CENTER")

diff --git a/ElvUI/modules/bags/bags.lua b/ElvUI/modules/bags/bags.lua
@@ -2,6 +2,7 @@ local E, L, V, P, G = unpack(ElvUI)
 local B = E:NewModule("Bags", "AceHook-3.0", "AceEvent-3.0", "AceTimer-3.0")
 local Search = LibStub("LibItemSearch-1.2")
 local LIP = LibStub("ItemPrice-1.1")
+local LSM = E.LSM
 
 local _G = _G
 local type, ipairs, pairs, unpack, select, assert, pcall = type, ipairs, pairs, unpack, select, assert, pcall
@@ -231,7 +232,7 @@ function B:UpdateItemLevelDisplay()
 			for slotID = 1, GetContainerNumSlots(bagID) do
 				local slot = bagFrame.Bags[bagID][slotID]
 				if slot and slot.itemLevel then
-					slot.itemLevel:FontTemplate(E.LSM:Fetch("font", E.db.bags.itemLevelFont), E.db.bags.itemLevelFontSize, E.db.bags.itemLevelFontOutline)
+					slot.itemLevel:FontTemplate(LSM:Fetch("font", E.db.bags.itemLevelFont), E.db.bags.itemLevelFontSize, E.db.bags.itemLevelFontOutline)
 				end
 			end
 		end
@@ -251,7 +252,7 @@ function B:UpdateCountDisplay()
 			for slotID = 1, GetContainerNumSlots(bagID) do
 				local slot = bagFrame.Bags[bagID][slotID]
 				if slot and slot.Count then
-					slot.Count:FontTemplate(E.LSM:Fetch("font", E.db.bags.countFont), E.db.bags.countFontSize, E.db.bags.countFontOutline)
+					slot.Count:FontTemplate(LSM:Fetch("font", E.db.bags.countFont), E.db.bags.countFontSize, E.db.bags.countFontOutline)
 					slot.Count:SetTextColor(color.r, color.g, color.b)
 				end
 			end
@@ -579,7 +580,7 @@ function B:Layout(isBank)
 					f.Bags[bagID][slotID].Count = _G[f.Bags[bagID][slotID]:GetName().."Count"]
 					f.Bags[bagID][slotID].Count:ClearAllPoints()
 					f.Bags[bagID][slotID].Count:Point("BOTTOMRIGHT", 0, 3)
-					f.Bags[bagID][slotID].Count:FontTemplate(E.LSM:Fetch("font", E.db.bags.countFont), E.db.bags.countFontSize, E.db.bags.countFontOutline)
+					f.Bags[bagID][slotID].Count:FontTemplate(LSM:Fetch("font", E.db.bags.countFont), E.db.bags.countFontSize, E.db.bags.countFontOutline)
 					f.Bags[bagID][slotID].Count:SetTextColor(countColor.r, countColor.g, countColor.b)
 
 					if not f.Bags[bagID][slotID].QuestIcon then
@@ -613,7 +614,7 @@ function B:Layout(isBank)
 
 					f.Bags[bagID][slotID].itemLevel = f.Bags[bagID][slotID]:CreateFontString(nil, "OVERLAY")
 					f.Bags[bagID][slotID].itemLevel:Point("BOTTOMRIGHT", 0, 3)
-					f.Bags[bagID][slotID].itemLevel:FontTemplate(E.LSM:Fetch("font", E.db.bags.itemLevelFont), E.db.bags.itemLevelFontSize, E.db.bags.itemLevelFontOutline)
+					f.Bags[bagID][slotID].itemLevel:FontTemplate(LSM:Fetch("font", E.db.bags.itemLevelFont), E.db.bags.itemLevelFontSize, E.db.bags.itemLevelFontOutline)
 				end
 
 				f.Bags[bagID][slotID]:SetID(slotID)