Bluewhale/ElvUIModernized
1
0
Fork 0
mirror of https://github.com/Bluewhale1337/ElvUIModernized.git synced 2026-07-27 16:34:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Crum
2017-12-19 23:41:26 -06:00
parent 0f720adce6
commit 620dc04ec3
10 changed files with 432 additions and 552 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2/3/4/5/6/7/ElvUI/Core/commands.lua
+1 -1
View File
@@ -4,7 +4,7 @@ local E, L, V, P, G = unpack(ElvUI); --Import: Engine, Locales, PrivateDB, Profi
--Lua functions --Lua functions
local _G = _G local _G = _G
local tonumber, type = tonumber, type local tonumber, type = tonumber, type
local format, lower = string.format, string.lower local format, lower, match = string.format, string.lower, string.match
--WoW API / Variables --WoW API / Variables
local InCombatLockdown = InCombatLockdown local InCombatLockdown = InCombatLockdown
local UIFrameFadeOut, UIFrameFadeIn = UIFrameFadeOut, UIFrameFadeIn local UIFrameFadeOut, UIFrameFadeIn = UIFrameFadeOut, UIFrameFadeIn
2/3/4/5/6/7/ElvUI/Core/core.lua
+4 -58
View File
@@ -812,7 +812,7 @@ function E:UpdateAll(ignoreInstall)
self:SetMoversPositions() self:SetMoversPositions()
self:UpdateMedia() self:UpdateMedia()
self:UpdateCooldownSettings() -- self:UpdateCooldownSettings()
local UF = self:GetModule("UnitFrames") local UF = self:GetModule("UnitFrames")
UF.db = self.db.unitframe UF.db = self.db.unitframe
@@ -827,13 +827,13 @@ function E:UpdateAll(ignoreInstall)
local AB = self:GetModule("ActionBars") local AB = self:GetModule("ActionBars")
AB.db = self.db.actionbar AB.db = self.db.actionbar
AB:UpdateButtonSettings() AB:UpdateButtonSettings()
AB:UpdateMicroPositionDimensions() -- AB:UpdateMicroPositionDimensions()
local bags = E:GetModule("Bags") local bags = E:GetModule("Bags")
bags.db = self.db.bags bags.db = self.db.bags
bags:Layout() bags:Layout()
bags:Layout(true) bags:Layout(true)
bags:SizeAndPositionBagBar() -- bags:SizeAndPositionBagBar()
bags:UpdateItemLevelDisplay() bags:UpdateItemLevelDisplay()
bags:UpdateCountDisplay() bags:UpdateCountDisplay()
@@ -886,60 +886,6 @@ function E:UpdateAll(ignoreInstall)
--self:GetModule("Blizzard"):SetWatchFrameHeight() --self:GetModule("Blizzard"):SetWatchFrameHeight()
end end
function E:EnterVehicleHideFrames(_, unit)
if(unit ~= "player") then return end
for object in pairs(E.VehicleLocks) do
object:SetParent(E.HiddenFrame)
end
end
function E:ExitVehicleShowFrames(_, unit)
if(unit ~= "player") then return end
for object, originalParent in pairs(E.VehicleLocks) do
object:SetParent(originalParent)
end
end
function E:RegisterObjectForVehicleLock(object, originalParent)
if(not object or not originalParent) then
E:Print("Error. Usage: RegisterObjectForVehicleLock(object, originalParent)")
return
end
object = _G[object] or object
if(object.IsProtected and object:IsProtected()) then
E:Print("Error. Object is protected and cannot be changed in combat.")
return
end
if(UnitHasVehicleUI("player")) then
object:SetParent(E.HiddenFrame)
end
E.VehicleLocks[object] = originalParent
end
function E:UnregisterObjectForVehicleLock(object)
if(not object) then
E:Print("Error. Usage: UnregisterObjectForVehicleLock(object)")
return
end
object = _G[object] or object
if(not E.VehicleLocks[object]) then
return
end
local originalParent = E.VehicleLocks[object]
if(originalParent) then
object:SetParent(originalParent)
end
E.VehicleLocks[object] = nil
end
function E:ResetAllUI() function E:ResetAllUI()
self:ResetMovers() self:ResetMovers()
@@ -1169,7 +1115,7 @@ function E:Initialize()
self.initialized = true self.initialized = true
if(self.private.install_complete == nil) then if(self.private.install_complete == nil) then
-- self:Install() self:Install()
end end
if(not find(date(), "04/01/")) then if(not find(date(), "04/01/")) then
2/3/4/5/6/7/ElvUI/Core/install.lua
+1 -1
View File
@@ -42,7 +42,7 @@ local function SetupChat()
FCF_DockFrame(ChatFrame2) FCF_DockFrame(ChatFrame2)
FCF_SetLocked(ChatFrame2, 1) FCF_SetLocked(ChatFrame2, 1)
FCF_OpenNewWindow(LOOT) -- FCF_OpenNewWindow(LOOT)
FCF_UnDockFrame(ChatFrame3) FCF_UnDockFrame(ChatFrame3)
FCF_SetLocked(ChatFrame3, 1) FCF_SetLocked(ChatFrame3, 1)
ChatFrame3:Show() ChatFrame3:Show()
2/3/4/5/6/7/ElvUI/Core/staticpopups.lua
+407 -473
View File
File diff suppressed because it is too large Load Diff
2/3/4/5/6/7/ElvUI/Libraries/AceCore-3.0/AceCore-3.0.lua
+1 -1
View File
@@ -3,7 +3,7 @@ local AceCore, oldminor = LibStub:NewLibrary(ACECORE_MAJOR, ACECORE_MINOR)
if not AceCore then return end -- No upgrade needed if not AceCore then return end -- No upgrade needed
AceCore._G = AceCore._G or getfenv() AceCore._G = AceCore._G or _G
local _G = AceCore._G local _G = AceCore._G
local strsub, strgsub, strfind = string.sub, string.gsub, string.find local strsub, strgsub, strfind = string.sub, string.gsub, string.find
local tremove, tconcat = table.remove, table.concat local tremove, tconcat = table.remove, table.concat
2/3/4/5/6/7/ElvUI/Libraries/LibUIDropDownMenu/LibEasyMenu.lua
+1 -1
View File
@@ -17,7 +17,7 @@
-- ---------------------------------------------------------------------------- -- ----------------------------------------------------------------------------
-- Localized Lua globals. -- Localized Lua globals.
-- ---------------------------------------------------------------------------- -- ----------------------------------------------------------------------------
local _G = getfenv(0) local _G = _G
-- ---------------------------------------------------------------------------- -- ----------------------------------------------------------------------------
local MAJOR_VERSION = "LibEasyMenu-1.04.7030024484" local MAJOR_VERSION = "LibEasyMenu-1.04.7030024484"
local MINOR_VERSION = 90000 + 19 local MINOR_VERSION = 90000 + 19
2/3/4/5/6/7/ElvUI/Libraries/oUF/elements/castbar.lua
+4 -4
View File
@@ -432,13 +432,13 @@ local function onUpdate(self, elapsed)
if(self.CustomDelayText) then if(self.CustomDelayText) then
self:CustomDelayText(duration) self:CustomDelayText(duration)
else else
self.Time:SetFormattedText('%.1f|cffff0000-%.1f|r', duration, self.delay) self.Time:SetText(format('%.1f|cffff0000-%.1f|r', duration, self.delay))
end end
else else
if(self.CustomTimeText) then if(self.CustomTimeText) then
self:CustomTimeText(duration) self:CustomTimeText(duration)
else else
self.Time:SetFormattedText('%.1f', duration) self.Time:SetText(format('%.1f', duration))
end end
end end
end end
@@ -465,13 +465,13 @@ local function onUpdate(self, elapsed)
if(self.CustomDelayText) then if(self.CustomDelayText) then
self:CustomDelayText(duration) self:CustomDelayText(duration)
else else
self.Time:SetFormattedText('%.1f|cffff0000-%.1f|r', duration, self.delay) self.Time:SetText(format('%.1f|cffff0000-%.1f|r', duration, self.delay))
end end
else else
if(self.CustomTimeText) then if(self.CustomTimeText) then
self:CustomTimeText(duration) self:CustomTimeText(duration)
else else
self.Time:SetFormattedText('%.1f', duration) self.Time:SetText(format('%.1f', duration))
end end
end end
end end
2/3/4/5/6/7/ElvUI/Modules/DataTexts/DataTexts.lua
+1 -1
View File
@@ -79,7 +79,7 @@ function DT:SetupObjectLDB(name, obj)
if value == nil or (len(value) >= 3) or value == "n/a" or name == value then if value == nil or (len(value) >= 3) or value == "n/a" or name == value then
curFrame.text:SetText(value ~= "n/a" and value or name) curFrame.text:SetText(value ~= "n/a" and value or name)
else else
curFrame.text:SetFormattedText("%s: %s%s|r", name, hex, value) curFrame.text:SetText(format("%s: %s%s|r", name, hex, value))
end end
end end
2/3/4/5/6/7/ElvUI/Modules/DataTexts/Friends.lua
+9 -9
View File
@@ -44,14 +44,14 @@ end
local menuFrame = CreateFrame("Frame", "FriendDatatextRightClickMenu", E.UIParent, "L_UIDropDownMenuTemplate") local menuFrame = CreateFrame("Frame", "FriendDatatextRightClickMenu", E.UIParent, "L_UIDropDownMenuTemplate")
local menuList = { local menuList = {
{text = "OPTIONS_MENU", isTitle = true, notCheckable = true}, {text = OPTIONS_MENU, isTitle = true, notCheckable = true},
{text = "INVITE", hasArrow = true, notCheckable = true}, {text = INVITE, hasArrow = true, notCheckable = true},
{text = "CHAT_MSG_WHISPER_INFORM", hasArrow = true, notCheckable= true}, {text = CHAT_MSG_WHISPER_INFORM, hasArrow = true, notCheckable = true},
{text = "PLAYER_STATUS", hasArrow = true, notCheckable = true, {text = PLAYER_STATUS, hasArrow = true, notCheckable = true,
menuList = { menuList = {
{text = "|cff2BC226" .. "AVAILABLE" .. "|r", notCheckable = true, func = function() end}, {text = "|cff2BC226" .. AVAILABLE .. "|r", notCheckable = true, func = function() end},
{text = "|cffE7E716" .. "AFK" .. "|r", notCheckable = true, func = function() end}, {text = "|cffE7E716" .. CHAT_MSG_AFK .. "|r", notCheckable = true, func = function() end},
{text = "|cffFF0000" .. "DND" .. "|r", notCheckable = true, func = function() end} {text = "|cffFF0000" .. CHAT_MSG_DND .. "|r", notCheckable = true, func = function() end}
} }
} }
} }
@@ -95,9 +95,9 @@ local function BuildFriendTable(total)
for i = 1, total do for i = 1, total do
name, level, class, area, connected, status, note = GetFriendInfo(i) name, level, class, area, connected, status, note = GetFriendInfo(i)
if status == "<" .. "AFK" .. ">" then if status == CHAT_FLAG_AFK then
status = "|cffFFFFFF[|r|cffFF0000" .. L["AFK"] .. "|r|cffFFFFFF]|r" status = "|cffFFFFFF[|r|cffFF0000" .. L["AFK"] .. "|r|cffFFFFFF]|r"
elseif status == "<" .. "DND" .. ">" then elseif status == CHAT_FLAG_DND then
status = "|cffFFFFFF[|r|cffFF0000" .. L["DND"] .. "|r|cffFFFFFF]|r" status = "|cffFFFFFF[|r|cffFF0000" .. L["DND"] .. "|r|cffFFFFFF]|r"
end end
2/3/4/5/6/7/ElvUI/Modules/DataTexts/Guild.lua
+3 -3
View File
@@ -118,10 +118,10 @@ local function OnEvent(self, event, ...)
end end
end end
local menuFrame = CreateFrame("Frame", "GuildDatatTextRightClickMenu", E.UIParent, "UIDropDownMenuTemplate") local menuFrame = CreateFrame("Frame", "GuildDatatTextRightClickMenu", E.UIParent, "L_UIDropDownMenuTemplate")
local menuList = { local menuList = {
{ text = OPTIONS_MENU, isTitle = true, notCheckable=true}, { text = OPTIONS_MENU, isTitle = true, notCheckable = true},
{ text = INVITE, hasArrow = true, notCheckable=true,}, { text = INVITE, hasArrow = true, notCheckable = true,},
{ text = CHAT_MSG_WHISPER_INFORM, hasArrow = true, notCheckable=true,} { text = CHAT_MSG_WHISPER_INFORM, hasArrow = true, notCheckable=true,}
} }