Skip to content

Commit

Permalink
clean up
Browse files Browse the repository at this point in the history
  • Loading branch information
Gethe committed Oct 6, 2014
1 parent f24a813 commit a746f10
Show file tree
Hide file tree
Showing 12 changed files with 15 additions and 28 deletions.
2 changes: 1 addition & 1 deletion Interface/AddOns/cargBags_Nivaya/style.lua
Expand Up @@ -213,7 +213,7 @@ local resetNewItems = function(self)
local tNumSlots = GetContainerNumSlots(bag)
if tNumSlots > 0 then
for slot = 1, tNumSlots do
local item = cbNivaya:GetItemInfo(bag, slot, i)
local item = cbNivaya:GetItemInfo(bag, slot, slot)
--print("resetNewItems", item.id)
item.id = item.id or 0
if cB_KnownItems[item.id] then
Expand Down
5 changes: 3 additions & 2 deletions Interface/AddOns/nibRealUI/Core.lua
Expand Up @@ -710,8 +710,9 @@ function nibRealUI:CPU_Profiling_Toggle()
end

function nibRealUI:Taint_Logging_Toggle()
SetCVar("taintLog", (GetCVar("taintLog") ~= "0") and "0" or "2")
--ReloadUI()
local taintLog = GetCVar("taintLog")
SetCVar("taintLog", (taintLog ~= "0") and "0" or "2")
print("Taint Logging is "..((taintLog ~= "0" and "disabled.") or "enabled."))
end

function nibRealUI:ADDON_LOADED(event, addon)
Expand Down
Expand Up @@ -445,7 +445,7 @@ function AuraTracking:UpdateFonts()
end

function AuraTracking:RegisterFont(type, fs)
if tpye == "cooldown" then
if type == "cooldown" then
tinsert(FontStringsCooldown, fs)
end
end
Expand Down
Expand Up @@ -61,7 +61,7 @@ local function AuraUpdate(self)
self.count:SetTextColor(nibRealUI:GetDurabilityColor(per))
else
self.count:SetText("100.")
self.count:SetTextColor(nibRealUI:GetDurabilityColor(per))
self.count:SetTextColor(nibRealUI:GetDurabilityColor(1))
end
else
self.count:SetText("")
Expand Down
Expand Up @@ -108,7 +108,6 @@ end

function ResolveBar:UpdateShown()
--print("UpdateShown")
if unit and unit ~= "player" then return end

if self.configMode then
self.rBar:Show()
Expand Down
15 changes: 1 addition & 14 deletions Interface/AddOns/nibRealUI/HuD/UnitFrames/Groups/Arena.lua
Expand Up @@ -186,20 +186,7 @@ local function CreateArena(self)

self:SetScript("OnEnter", UnitFrame_OnEnter)
self:SetScript("OnLeave", UnitFrame_OnLeave)

function self:PostUpdate(event)
local _, instanceType = IsInInstance()
if instanceType == "arena" then
self:RegisterEvent("UNIT_SPELLCAST_SUCCEEDED", UpdateTrinket)
self.Trinket.icon:SetTexture([[Interface\Icons\PVPCurrency-Conquest-]]..UnitFactionGroup(self.unit))
elseif self:IsEventRegistered("UNIT_SPELLCAST_SUCCEEDED") then
self:UnregisterEvent("UNIT_SPELLCAST_SUCCEEDED")
for _, trinket in pairs(trinkets) do
trinket:SetCooldown(0, 0)
trinket:Hide()
end
end
end
self:RegisterEvent("UNIT_SPELLCAST_SUCCEEDED", UpdateTrinket)
end

-- Init
Expand Down
2 changes: 1 addition & 1 deletion Interface/AddOns/nibRealUI/Misc/StopAddonSpam.lua
Expand Up @@ -107,7 +107,7 @@ end

-- Filter out messages
function StopAddonSpam:AddMessage(obj, msg, r, g, b, id)
if not self:IsMessageSpam(msg, id, this) then
if not self:IsMessageSpam(msg, id, obj) then
-- Let the message pass through.
self.hooks[obj].AddMessage(obj, msg, r, g, b, id)
end
Expand Down
2 changes: 1 addition & 1 deletion Interface/AddOns/nibRealUI/Modules/AddonListAdv.lua
Expand Up @@ -292,7 +292,7 @@ function AddonListAdv:SetDropDown_Populate(level)
info.text = "Create a new set"
info.hasArrow = false
info.func = function()
StaticPopup_Show("ALA_SaveAs", setName)
StaticPopup_Show("ALA_SaveAs")
end
UIDropDownMenu_AddButton(info)
elseif level == 2 then
Expand Down
4 changes: 2 additions & 2 deletions Interface/AddOns/nibRealUI/Modules/GridLayout.lua
Expand Up @@ -70,7 +70,7 @@ function GridLayout:UpdateLockdown(...)
end

-- Reload Grid Layout
local function ReloadGridLayout()
local function ReloadGridLayout(NewWidth)
local ReloadLayoutTimer = CreateFrame("Frame")
ReloadLayoutTimer:Show()
ReloadLayoutTimer.Elapsed = 0
Expand Down Expand Up @@ -116,7 +116,7 @@ local function SetGridFrameWidth(NewWidth)
if FM then FM:MoveAddons() end
end

-- ReloadGridLayout()
-- ReloadGridLayout(NewWidth)
end

ResizeTimer.Elapsed = 0
Expand Down
4 changes: 2 additions & 2 deletions Interface/AddOns/nibRealUI/Modules/InfoLine.lua
Expand Up @@ -1903,7 +1903,7 @@ local function Friends_OnEnter(self)
end
end

local BNetRequestAlert = CreateFrame("Frame", nil, self, "MicroButtonAlertTemplate")
local BNetRequestAlert = CreateFrame("Frame", nil, ILFrames.friends, "MicroButtonAlertTemplate")
local function Friends_BNetRequest(self, event, ...)
if (event == "BN_FRIEND_INVITE_REMOVED") then
BNetRequestAlert:Hide();
Expand Down Expand Up @@ -3952,7 +3952,7 @@ function InfoLine:CreateFrames()
ILFrames.spec:RegisterEvent("ACTIVE_TALENT_GROUP_CHANGED")
ILFrames.spec:RegisterEvent("EQUIPMENT_SETS_CHANGED")
ILFrames.spec:RegisterEvent("PLAYER_EQUIPMENT_CHANGED")
ILFrames.spec:SetScript("OnEvent", function(self)
ILFrames.spec:SetScript("OnEvent", function(self, event)
if not db.elements.specchanger then return end
if event == "UPDATE_PENDING_MAIL" then
ILFrames.spec:UnregisterEvent("UPDATE_PENDING_MAIL")
Expand Down
2 changes: 1 addition & 1 deletion Interface/AddOns/nibRealUI/Modules/MinimapAdv.lua
Expand Up @@ -1332,7 +1332,7 @@ end

function MinimapAdv:UpdatePOIEnabled()
if db.poi.enabled and not(IsAddOnLoaded("Carbonite") or IsAddOnLoaded("DugisGuideViewerZ")) then
QuestPOI_Initialize(Minimap, onCreateFunc)
QuestPOI_Initialize(Minimap, function(self) end)
self:POIUpdate()
self:InitializePOI()
else
Expand Down
2 changes: 1 addition & 1 deletion Interface/AddOns/nibRealUI/Modules/Pitch.lua
Expand Up @@ -428,7 +428,7 @@ end
---- UPDATES
local function ClassColorsUpdate()
if PitchFrame then
self:UpdateColors()
Pitch:UpdateColors()
end
end

Expand Down

0 comments on commit a746f10

Please sign in to comment.