1. 825496a17dd3f0d7730da3e45ab7fd703c40e62c
  2. ElvUI/modules/bags/sort.lua | 31 ++++++++-----------------------
  3. 1 file changed, 8 insertions(+), 23 deletions(-)
  5. diff --git a/ElvUI/modules/bags/sort.lua b/ElvUI/modules/bags/sort.lua
  6. index 999d544..d5f5184 100644
  7. --- a/ElvUI/modules/bags/sort.lua
  8. +++ b/ElvUI/modules/bags/sort.lua
  9. @@ -75,7 +75,6 @@ local bagStacks = {};
  10. local bagMaxStacks = {};
  11. local bagGroups = {};
  12. local initialOrder = {};
  13. ---local itemTypes, itemSubTypes
  14. local bagSorted, bagLocked = {}, {};
  15. local bagRole
  16. local moves = {};
  17. @@ -139,18 +138,6 @@ local function IsGuildBankBag(bagid)
  18. return (bagid > 50 and bagid <= 58)
  19. end
  21. ---[[local function BuildSortOrder()
  22. - itemTypes = {}
  23. - itemSubTypes = {}
  24. - for i, iType in ipairs({GetAuctionItemClasses()}) do
  25. - itemTypes[iType] = i
  26. - itemSubTypes[iType] = {}
  27. - for ii, isType in ipairs({GetAuctionItemSubClasses(i)}) do
  28. - itemSubTypes[iType][isType] = ii
  29. - end
  30. - end
  31. -end]]
  32. -
  33. local function UpdateLocation(from, to)
  34. if (bagIDs[from] == bagIDs[to]) and (bagStacks[to] < bagMaxStacks[to]) then
  35. local stackSize = bagMaxStacks[to]
  36. @@ -218,8 +205,8 @@ local function DefaultSort(a, b)
  37. end
  38. end
  40. - local _, _, aRarity, _, _, aType, aSubType, _, aEquipLoc = GetItemInfo(aID)
  41. - local _, _, bRarity, _, _, bType, bSubType, _, bEquipLoc = GetItemInfo(bID)
  42. + local _, _, aRarity, _, _, _, _, _, aEquipLoc, _, _, aItemClassId, aItemSubClassId = GetItemInfo(aID)
  43. + local _, _, bRarity, _, _, _, _, _, bEquipLoc, _, _, bItemClassId, bItemSubClassId = GetItemInfo(bID)
  45. if bagPetIDs[a] then
  46. aRarity = 1
  47. @@ -233,11 +220,11 @@ local function DefaultSort(a, b)
  48. return aRarity > bRarity
  49. end
  51. - --[[if itemTypes[aType] ~= itemTypes[bType] then
  52. - return (itemTypes[aType] or 99) < (itemTypes[bType] or 99)
  53. - end]]
  54. + if aItemClassId ~= bItemClassId then
  55. + return (aItemClassId or 99) < (bItemClassId or 99)
  56. + end
  58. - if aType == ARMOR or aType == ENCHSLOT_WEAPON then
  59. + if aItemClassId == LE_ITEM_CLASS_ARMOR or aItemClassId == LE_ITEM_CLASS_WEAPON then
  60. local aEquipLoc = inventorySlots[aEquipLoc] or -1
  61. local bEquipLoc = inventorySlots[bEquipLoc] or -1
  62. if aEquipLoc == bEquipLoc then
  63. @@ -248,12 +235,11 @@ local function DefaultSort(a, b)
  64. return aEquipLoc < bEquipLoc
  65. end
  66. end
  67. - if aSubType == bSubType then
  68. + if (aItemClassId == bItemClassId) and (aItemSubClassId == bItemSubClassId) then
  69. return PrimarySort(a, b)
  70. end
  72. - --return (({})[aSubType] or 99) < (({})[bSubType] or 99)
  73. - return false
  74. + return (aItemSubClassId or 99) < (bItemSubClassId or 99)
  75. end
  77. local function ReverseSort(a, b)
  78. @@ -545,7 +531,6 @@ end
  80. function B.Sort(bags, sorter, invertDirection)
  81. if not sorter then sorter = invertDirection and ReverseSort or DefaultSort end
  82. - --if not itemTypes then BuildSortOrder() end
  84. twipe(blackListedSlots)