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

update

Browse Source
This commit is contained in:
Crum
2018-10-08 19:56:57 -05:00
parent c26b2cf337
commit 4afd0461bb
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElvUI/Core/core.lua
+4 -4
View File
@@ -1112,11 +1112,11 @@ function E:Initialize()
self:Install() self:Install()
end end
if not find(date(), "04/01/") then -- if not find(date(), "04/01/") then
E.global.aprilFools = nil -- E.global.aprilFools = nil
end -- end
--if(self:HelloKittyFixCheck()) then --if self:HelloKittyFixCheck() then
-- self:HelloKittyFix() -- self:HelloKittyFix()
--end --end
ElvUI/Modules/Bags/Sort.lua
+9 -10
View File
@@ -5,24 +5,24 @@ local LIP = LibStub("ItemPrice-1.1");
--Cache global variables --Cache global variables
--Lua functions --Lua functions
local ipairs, pairs, pcall, tonumber, select, unpack, pcall = ipairs, pairs, pcall, tonumber, select, unpack, pcall local ipairs, pairs, tonumber, select, unpack, pcall = ipairs, pairs, tonumber, select, unpack, pcall
local getn, tinsert, tremove, tsort, twipe = table.getn, table.insert, table.remove, table.sort, table.wipe local getn, tinsert, tremove, tsort, twipe = table.getn, table.insert, table.remove, table.sort, table.wipe
local floor, mod = math.floor, math.mod local floor, mod = math.floor, math.mod
local band = bit.band local band = bit.band
local match, gmatch, find = string.match, string.gmatch, string.find local match, gmatch, find = string.match, string.gmatch, string.find
--WoW API / Variables --WoW API / Variables
local GetTime = GetTime local ContainerIDToInventoryID = ContainerIDToInventoryID
local GetItemInfo = GetItemInfo local CursorHasItem = CursorHasItem
local GetAuctionItemClasses = GetAuctionItemClasses local GetAuctionItemClasses = GetAuctionItemClasses
local GetAuctionItemSubClasses = GetAuctionItemSubClasses local GetAuctionItemSubClasses = GetAuctionItemSubClasses
local GetContainerItemInfo = GetContainerItemInfo local GetContainerItemInfo = GetContainerItemInfo
local GetContainerItemLink = GetContainerItemLink local GetContainerItemLink = GetContainerItemLink
local GetContainerNumSlots = GetContainerNumSlots
local GetInventoryItemLink = GetInventoryItemLink
local GetItemInfo = GetItemInfo
local GetTime = GetTime
local PickupContainerItem = PickupContainerItem local PickupContainerItem = PickupContainerItem
local SplitContainerItem = SplitContainerItem local SplitContainerItem = SplitContainerItem
local GetContainerNumSlots = GetContainerNumSlots
local ContainerIDToInventoryID = ContainerIDToInventoryID
local GetInventoryItemLink = GetInventoryItemLink
local CursorHasItem = CursorHasItem
local bankBags = {BANK_CONTAINER} local bankBags = {BANK_CONTAINER}
local MAX_MOVE_TIME = 1.25 local MAX_MOVE_TIME = 1.25
@@ -57,7 +57,7 @@ local bagStacks = {}
local bagMaxStacks = {} local bagMaxStacks = {}
local bagGroups = {} local bagGroups = {}
local initialOrder = {} local initialOrder = {}
local itemTypes, itemSubTypes = {}, {}
local bagSorted, bagLocked = {}, {} local bagSorted, bagLocked = {}, {}
local moves = {} local moves = {}
local targetItems = {} local targetItems = {}
@@ -116,7 +116,6 @@ end)
frame:Hide() frame:Hide()
B.SortUpdateTimer = frame B.SortUpdateTimer = frame
local itemTypes, itemSubTypes = {}, {}
local function BuildSortOrder() local function BuildSortOrder()
for i, iType in ipairs({GetAuctionItemClasses()}) do for i, iType in ipairs({GetAuctionItemClasses()}) do
itemTypes[iType] = i itemTypes[iType] = i
@@ -126,7 +125,6 @@ local function BuildSortOrder()
end end
end end
end end
BuildSortOrder()
local function UpdateLocation(from, to) local function UpdateLocation(from, to)
if (bagIDs[from] == bagIDs[to]) and (bagStacks[to] < bagMaxStacks[to]) then if (bagIDs[from] == bagIDs[to]) and (bagStacks[to] < bagMaxStacks[to]) then
@@ -475,6 +473,7 @@ end
function B.Sort(bags, sorter, invertDirection) function B.Sort(bags, sorter, invertDirection)
if not sorter then sorter = invertDirection and ReverseSort or DefaultSort end if not sorter then sorter = invertDirection and ReverseSort or DefaultSort end
if not itemTypes then BuildSortOrder() end
--Wipe tables before we begin --Wipe tables before we begin
twipe(blackList) twipe(blackList)