from retail

This commit is contained in:
Bunny67
2021-03-07 19:42:16 +03:00
parent b3be159906
commit 6e530142d3
41 changed files with 2796 additions and 2128 deletions
+3 -7
View File
@@ -1564,12 +1564,8 @@ local function ShowDisplayTooltip(data, children, matchInfo, icon, icons, import
end
elseif(trigger.type == "aura2") then
tinsert(tooltip, {2, L["Trigger:"], L["Aura"], 1, 1, 1, 1, 1, 1});
elseif(trigger.type == "event" or trigger.type == "status") then
if(trigger.type == "event") then
tinsert(tooltip, {2, L["Trigger:"], (Private.event_types[trigger.event] or L["Undefined"]), 1, 1, 1, 1, 1, 1});
else
tinsert(tooltip, {2, L["Trigger:"], (Private.status_types[trigger.event] or L["Undefined"]), 1, 1, 1, 1, 1, 1});
end
elseif(Private.category_event_prototype[trigger.type]) then
tinsert(tooltip, {2, L["Trigger:"], (Private.event_prototypes[trigger.event].name or L["Undefined"]), 1, 1, 1, 1, 1, 1});
if(trigger.event == "Combat Log" and trigger.subeventPrefix and trigger.subeventSuffix) then
tinsert(tooltip, {2, L["Message type:"], (Private.subevent_prefix_types[trigger.subeventPrefix] or L["Undefined"]).." "..(Private.subevent_suffix_types[trigger.subeventSuffix] or L["Undefined"]), 1, 1, 1, 1, 1, 1});
end
@@ -1677,7 +1673,7 @@ function WeakAuras.Import(inData, target)
return nil, "Invalid import data."
end
local status, msg = true, ""
if type(target) ~= nil then
if type(target) ~= 'nil' then
local targetData
local uid = type(target) == 'table' and target.uid or target
if type(uid) == 'string' then