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

Merge pull request #2 from EnsignPayton/lua-errors-2

Browse Source 
Vendoring Fixes
This commit is contained in:
Crum
2018-02-20 10:27:55 -06:00
committed by GitHub
parent 9c8601bd02 b4f8cad7d0
commit b8c15d6318
2 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
!Compatibility/api/wowAPI.lua
+1 -1
View File
@@ -386,7 +386,7 @@ function GetItemInfoByName(itemName)
for itemID = 1, LAST_ITEM_ID do for itemID = 1, LAST_ITEM_ID do
name = GetItemInfo(itemID) name = GetItemInfo(itemID)
if name ~= "" then if name ~= "" and name ~= nil then
itemInfoDB[name] = itemID itemInfoDB[name] = itemID
if name == itemName then if name == itemName then
ElvUI/Modules/Bags/Bags.lua
+15 -19
View File
@@ -697,7 +697,7 @@ function B:GetGraysValue()
local c = 0 local c = 0
for b = 0, NUM_BAG_FRAMES do for b = 0, NUM_BAG_FRAMES do
for s = 0, GetContainerNumSlots(b) do for s = 1, GetContainerNumSlots(b) do
local l = GetContainerItemLink(b, s) local l = GetContainerItemLink(b, s)
if l and find(l,"ff9d9d9d") then if l and find(l,"ff9d9d9d") then
-- local p = LIP:GetSellValue(l) * select(2, GetContainerItemInfo(b, s)) -- local p = LIP:GetSellValue(l) * select(2, GetContainerItemInfo(b, s))
@@ -724,24 +724,19 @@ function B:VendorGrays(delete, _, getValue)
local l = GetContainerItemLink(b, s) local l = GetContainerItemLink(b, s)
if l and find(l,"ff9d9d9d") then if l and find(l,"ff9d9d9d") then
-- local p = LIP:GetSellValue(l) * select(2, GetContainerItemInfo(b, s)) -- local p = LIP:GetSellValue(l) * select(2, GetContainerItemInfo(b, s))
if delete then if delete then
if find(l,"ff9d9d9d") then if not getValue then
if not getValue then PickupContainerItem(b, s)
PickupContainerItem(b, s) DeleteCursorItem()
DeleteCursorItem()
end
c = c + p
count = count + 1
end end
-- c = c + p
count = count + 1
else else
if select(3, GetItemInfo(l)) == 0 and p > 0 then if not getValue then
if not getValue then UseContainerItem(b, s)
UseContainerItem(b, s) PickupMerchantItem()
PickupMerchantItem()
end
c = c + p
end end
-- c = c + p
end end
end end
end end
@@ -758,11 +753,12 @@ function B:VendorGrays(delete, _, getValue)
end end
function B:VendorGrayCheck() function B:VendorGrayCheck()
local value = B:GetGraysValue() -- local value = B:GetGraysValue()
if value == 0 then -- if value == 0 then
E:Print(L["No gray items to delete."]) -- E:Print(L["No gray items to delete."])
elseif not MerchantFrame or not MerchantFrame:IsShown() then -- else
if not MerchantFrame or not MerchantFrame:IsShown() then
E.PopupDialogs["DELETE_GRAYS"].Money = value E.PopupDialogs["DELETE_GRAYS"].Money = value
E:StaticPopup_Show("DELETE_GRAYS") E:StaticPopup_Show("DELETE_GRAYS")
else else