From 89774c68ab5621e0c2e279fc5e4b0d6276e59b01 Mon Sep 17 00:00:00 2001 From: Crum Date: Wed, 3 Jan 2018 14:08:34 -0600 Subject: [PATCH] cleanup --- 2/3/4/5/6/7/ElvUI/Developer/Frame.lua | 2 +- .../Libraries/LibSharedMedia-3.0/LibSharedMedia-3.0.lua | 2 +- 2/3/4/5/6/7/ElvUI/Libraries/LibStub/LibStub.lua | 2 +- .../Libraries/LibUIDropDownMenu/LibUIDropDownMenu.lua | 8 ++++---- 2/3/4/5/6/7/ElvUI/Modules/ActionBars/ButtonColoring.lua | 2 +- 2/3/4/5/6/7/ElvUI/Modules/Skins/Addons/Ace3.lua | 4 ++-- 2/3/4/5/6/7/ElvUI_Config/ActionBars.lua | 2 +- 2/3/4/5/6/7/ElvUI_Config/Libraries/Load_Libraries.xml | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/2/3/4/5/6/7/ElvUI/Developer/Frame.lua b/2/3/4/5/6/7/ElvUI/Developer/Frame.lua index 10810f9..71ac1bc 100644 --- a/2/3/4/5/6/7/ElvUI/Developer/Frame.lua +++ b/2/3/4/5/6/7/ElvUI/Developer/Frame.lua @@ -1,6 +1,6 @@ --Cache global variables --Lua functions -local _G = getfenv() +local _G = _G local format = string.format --WoW API / Variables local GetMouseFocus = GetMouseFocus diff --git a/2/3/4/5/6/7/ElvUI/Libraries/LibSharedMedia-3.0/LibSharedMedia-3.0.lua b/2/3/4/5/6/7/ElvUI/Libraries/LibSharedMedia-3.0/LibSharedMedia-3.0.lua index 8edaf39..f250cb3 100644 --- a/2/3/4/5/6/7/ElvUI/Libraries/LibSharedMedia-3.0/LibSharedMedia-3.0.lua +++ b/2/3/4/5/6/7/ElvUI/Libraries/LibSharedMedia-3.0/LibSharedMedia-3.0.lua @@ -14,7 +14,7 @@ local lib = LibStub:NewLibrary(MAJOR, MINOR) if not lib then return end -local _G = getfenv(0) +local _G = _G local pairs = _G.pairs local type = _G.type diff --git a/2/3/4/5/6/7/ElvUI/Libraries/LibStub/LibStub.lua b/2/3/4/5/6/7/ElvUI/Libraries/LibStub/LibStub.lua index 4cda3c7..b4c38e1 100644 --- a/2/3/4/5/6/7/ElvUI/Libraries/LibStub/LibStub.lua +++ b/2/3/4/5/6/7/ElvUI/Libraries/LibStub/LibStub.lua @@ -1,7 +1,7 @@ -- LibStub is a simple versioning stub meant for use in Libraries. http://www.wowace.com/wiki/LibStub for more info -- LibStub is hereby placed in the Public Domain Credits: Kaelten, Cladhaire, ckknight, Mikk, Ammo, Nevcairiel, joshborke local LIBSTUB_MAJOR, LIBSTUB_MINOR = "LibStub", 2 -- NEVER MAKE THIS AN SVN REVISION! IT NEEDS TO BE USABLE IN ALL REPOS! -local _G = getfenv() +local _G = _G local strfind, strfmt = string.find, string.format local LibStub = _G[LIBSTUB_MAJOR] diff --git a/2/3/4/5/6/7/ElvUI/Libraries/LibUIDropDownMenu/LibUIDropDownMenu.lua b/2/3/4/5/6/7/ElvUI/Libraries/LibUIDropDownMenu/LibUIDropDownMenu.lua index fd8e70c..2f7455f 100644 --- a/2/3/4/5/6/7/ElvUI/Libraries/LibUIDropDownMenu/LibUIDropDownMenu.lua +++ b/2/3/4/5/6/7/ElvUI/Libraries/LibUIDropDownMenu/LibUIDropDownMenu.lua @@ -2,7 +2,7 @@ -- ---------------------------------------------------------------------------- -- Localized Lua globals. -- ---------------------------------------------------------------------------- -local _G = getfenv(0) +local _G = _G local strsub, strlen, strmatch, gsub = strsub, strlen, strmatch, gsub local max, match = max, match local securecall, issecure = securecall, issecure @@ -477,7 +477,7 @@ function L_UIDropDownMenu_AddButton(info, level) end - if not info.notCheckable then + if not info.notCheckable then if ( info.disabled ) then _G[listFrameName.."Button"..index.."Check"]:SetDesaturated(true); _G[listFrameName.."Button"..index.."Check"]:SetAlpha(0.5); @@ -502,7 +502,7 @@ function L_UIDropDownMenu_AddButton(info, level) end else _G[listFrameName.."Button"..index.."Check"]:Hide(); - end + end button.checked = info.checked; -- If has a colorswatch, show it and vertex color it @@ -579,7 +579,7 @@ end function L_UIDropDownMenu_Refresh(frame, useValue, dropdownLevel) local button, checked, checkImage, normalText, width; local maxWidth = 0; - local somethingChecked = nil; + local somethingChecked = nil; if ( not dropdownLevel ) then dropdownLevel = L_UIDROPDOWNMENU_MENU_LEVEL; end diff --git a/2/3/4/5/6/7/ElvUI/Modules/ActionBars/ButtonColoring.lua b/2/3/4/5/6/7/ElvUI/Modules/ActionBars/ButtonColoring.lua index 2a1ac7d..6311d71 100644 --- a/2/3/4/5/6/7/ElvUI/Modules/ActionBars/ButtonColoring.lua +++ b/2/3/4/5/6/7/ElvUI/Modules/ActionBars/ButtonColoring.lua @@ -6,7 +6,7 @@ local E, L, V, P, G = unpack(ElvUI) -local _G = getfenv() +local _G = _G local UPDATE_DELAY = 0.1 local ActionHasRange = ActionHasRange diff --git a/2/3/4/5/6/7/ElvUI/Modules/Skins/Addons/Ace3.lua b/2/3/4/5/6/7/ElvUI/Modules/Skins/Addons/Ace3.lua index 71721d0..094f248 100644 --- a/2/3/4/5/6/7/ElvUI/Modules/Skins/Addons/Ace3.lua +++ b/2/3/4/5/6/7/ElvUI/Modules/Skins/Addons/Ace3.lua @@ -3,7 +3,7 @@ local S = E:GetModule("Skins"); --Cache global variables --Lua functions -local _G = getfenv() +local _G = _G local unpack = unpack local pairs = pairs --WoW API / Variables @@ -327,7 +327,7 @@ function S:SkinAce3() if(not E.GUIFrame) then E.GUIFrame = frame end - + for _, child in ipairs({frame:GetChildren()}) do if child:GetObjectType() == "Button" and child:GetText() then SkinButton(child) diff --git a/2/3/4/5/6/7/ElvUI_Config/ActionBars.lua b/2/3/4/5/6/7/ElvUI_Config/ActionBars.lua index 1328cd4..3c0c4d4 100644 --- a/2/3/4/5/6/7/ElvUI_Config/ActionBars.lua +++ b/2/3/4/5/6/7/ElvUI_Config/ActionBars.lua @@ -109,7 +109,7 @@ local function BuildABConfig() colorGroup = { order = 12, type = "group", - name = "COLORS", + name = L["Colors"], guiInline = true, get = function(info) local t = E.db.actionbar[ info[getn(info)] ] diff --git a/2/3/4/5/6/7/ElvUI_Config/Libraries/Load_Libraries.xml b/2/3/4/5/6/7/ElvUI_Config/Libraries/Load_Libraries.xml index 02e8198..dd05573 100644 --- a/2/3/4/5/6/7/ElvUI_Config/Libraries/Load_Libraries.xml +++ b/2/3/4/5/6/7/ElvUI_Config/Libraries/Load_Libraries.xml @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file