From 88052dd29fc8b05b0803bce5a32911d98ca0566a Mon Sep 17 00:00:00 2001 From: Bunny67 Date: Mon, 23 Jul 2018 17:31:48 +0300 Subject: [PATCH] update dt --- ElvUI/Modules/DataTexts/DataTexts.lua | 4 ++-- ElvUI/Modules/DataTexts/Friends.lua | 4 ++-- ElvUI/Modules/DataTexts/Gold.lua | 4 ++-- ElvUI/Modules/DataTexts/Guild.lua | 12 ++++++------ ElvUI/Modules/DataTexts/System.lua | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ElvUI/Modules/DataTexts/DataTexts.lua b/ElvUI/Modules/DataTexts/DataTexts.lua index eac20da..e7357ae 100644 --- a/ElvUI/Modules/DataTexts/DataTexts.lua +++ b/ElvUI/Modules/DataTexts/DataTexts.lua @@ -196,7 +196,7 @@ function DT:AssignPanelToDataText(panel, data) if data["eventFunc"] then panel:SetScript("OnEvent", function() - data["eventFunc"](this, event, arg1, arg2, arg3) + data["eventFunc"](this, event) end) data["eventFunc"](panel, "ELVUI_FORCE_RUN") end @@ -210,7 +210,7 @@ function DT:AssignPanelToDataText(panel, data) if data["onClick"] then panel:SetScript("OnClick", function() - data["onClick"](this, arg1) + data["onClick"](this) end) end diff --git a/ElvUI/Modules/DataTexts/Friends.lua b/ElvUI/Modules/DataTexts/Friends.lua index ca32a29..c2a0c7f 100644 --- a/ElvUI/Modules/DataTexts/Friends.lua +++ b/ElvUI/Modules/DataTexts/Friends.lua @@ -98,11 +98,11 @@ local function BuildFriendTable(total) end end -local function OnEvent(self, event, message) +local function OnEvent(self, event) local _, onlineFriends = GetNumberFriends() if event == "CHAT_MSG_SYSTEM" then - if not (find(message, friendOnline) or find(message, friendOffline)) then return end + if not (find(arg1, friendOnline) or find(arg1, friendOffline)) then return end end dataValid = false diff --git a/ElvUI/Modules/DataTexts/Gold.lua b/ElvUI/Modules/DataTexts/Gold.lua index 7ca9ea4..8db8b92 100644 --- a/ElvUI/Modules/DataTexts/Gold.lua +++ b/ElvUI/Modules/DataTexts/Gold.lua @@ -34,8 +34,8 @@ local function OnEvent(self) ElvDB["gold"][E.myrealm][E.myname] = NewMoney end -local function OnClick(self, btn) - if btn == "RightButton" and IsShiftKeyDown() then +local function OnClick(self) + if arg1 == "RightButton" and IsShiftKeyDown() then ElvDB.gold = nil OnEvent(self) DT.tooltip:Hide() diff --git a/ElvUI/Modules/DataTexts/Guild.lua b/ElvUI/Modules/DataTexts/Guild.lua index a5d5beb..acd771e 100644 --- a/ElvUI/Modules/DataTexts/Guild.lua +++ b/ElvUI/Modules/DataTexts/Guild.lua @@ -103,20 +103,20 @@ local eventHandlers = { end, ["PLAYER_GUILD_UPDATE"] = GuildRoster, -- our guild message of the day changed - ["GUILD_MOTD"] = function(self, arg1) + ["GUILD_MOTD"] = function(self) guildMotD = arg1 end, - ["ELVUI_FORCE_RUN"] = function() - GuildRoster() - end, -- Temporarily + ["ELVUI_FORCE_RUN"] = E.noop, ["ELVUI_COLOR_UPDATE"] = E.noop, + + ["PLAYER_LOGIN"] = GuildRoster, -- Temporarily } -local function OnEvent(self, event, arg1) +local function OnEvent(self, event) lastPanel = self if IsInGuild() then - eventHandlers[event](self, arg1) + eventHandlers[event](self, event) self.text:SetText(format(displayString, getn(guildTable))) else diff --git a/ElvUI/Modules/DataTexts/System.lua b/ElvUI/Modules/DataTexts/System.lua index 9344c39..a4915b1 100644 --- a/ElvUI/Modules/DataTexts/System.lua +++ b/ElvUI/Modules/DataTexts/System.lua @@ -45,10 +45,10 @@ local function ToggleGameMenuFrame() end end -local function OnClick(_, btn) - if btn == "RightButton" then +local function OnClick() + if arg1 == "RightButton" then collectgarbage() - elseif btn == "LeftButton" then + elseif arg1 == "LeftButton" then ToggleGameMenuFrame() end end