from retail
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, Private = ...
|
||||
|
||||
-- Animations
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, Private = ...
|
||||
|
||||
local WeakAuras = WeakAuras
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, Private = ...
|
||||
|
||||
local WeakAuras = WeakAuras
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
This used to contains the "aura" trigger for buffs and debuffs. Nowadays all functions do essentially nothing
|
||||
]]--
|
||||
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, Private = ...
|
||||
|
||||
local L = WeakAuras.L
|
||||
|
||||
@@ -50,7 +50,7 @@ Returns the tooltip text for additional properties.
|
||||
GetTriggerConditions(data, triggernum)
|
||||
Returns the potential conditions for a trigger
|
||||
]]--
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, Private = ...
|
||||
|
||||
-- Lua APIs
|
||||
@@ -1708,7 +1708,7 @@ local function RecheckActiveForUnitType(unitType, unit, unitsToRemoveScan)
|
||||
end
|
||||
end
|
||||
|
||||
local frame = CreateFrame("FRAME")
|
||||
local frame = CreateFrame("Frame")
|
||||
WeakAuras.frames["WeakAuras Buff2 Frame"] = frame
|
||||
|
||||
local function EventHandler(frame, event, arg1, arg2, ...)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, Private = ...
|
||||
|
||||
local L = WeakAuras.L
|
||||
@@ -843,7 +843,7 @@ function Private.RegisterForGlobalConditions(uid)
|
||||
end
|
||||
|
||||
if (next(register) and not dynamicConditionsFrame) then
|
||||
dynamicConditionsFrame = CreateFrame("FRAME");
|
||||
dynamicConditionsFrame = CreateFrame("Frame");
|
||||
dynamicConditionsFrame:SetScript("OnEvent", handleDynamicConditions);
|
||||
dynamicConditionsFrame.units = {}
|
||||
WeakAuras.frames["Rerun Conditions Frame"] = dynamicConditionsFrame
|
||||
@@ -860,7 +860,7 @@ function Private.RegisterForGlobalConditions(uid)
|
||||
if unitEvent and unit then
|
||||
unit = unit:lower()
|
||||
if not dynamicConditionsFrame.units[unit] then
|
||||
dynamicConditionsFrame.units[unit] = CreateFrame("FRAME");
|
||||
dynamicConditionsFrame.units[unit] = CreateFrame("Frame");
|
||||
dynamicConditionsFrame.units[unit]:SetScript("OnEvent", handleDynamicConditionsPerUnit);
|
||||
end
|
||||
dynamicConditionsFrame.units[unit].unit = unit;
|
||||
@@ -909,7 +909,7 @@ function Private.UnloadAllConditions()
|
||||
dynamicConditions = {}
|
||||
if dynamicConditionsFrame then
|
||||
dynamicConditionsFrame:UnregisterAllEvents()
|
||||
for unit, frame in pairs(dynamicConditionsFrame.units) do
|
||||
for _, frame in pairs(dynamicConditionsFrame.units) do
|
||||
frame:UnregisterAllEvents()
|
||||
end
|
||||
dynamicConditionsFrame:SetScript("OnUpdate", nil)
|
||||
|
||||
@@ -49,7 +49,7 @@ Returns the a tooltip for the additional properties.
|
||||
GetTriggerConditions(data, triggernum)
|
||||
Returns potential conditions that this trigger provides.
|
||||
]]--
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, Private = ...
|
||||
|
||||
-- Lua APIs
|
||||
@@ -1086,7 +1086,7 @@ end
|
||||
|
||||
local genericTriggerRegisteredEvents = {};
|
||||
local genericTriggerRegisteredUnitEvents = {};
|
||||
local frame = CreateFrame("FRAME");
|
||||
local frame = CreateFrame("Frame");
|
||||
frame.unitFrames = {};
|
||||
WeakAuras.frames["WeakAuras Generic Trigger Frame"] = frame;
|
||||
frame:RegisterEvent("PLAYER_ENTERING_WORLD");
|
||||
@@ -1631,7 +1631,7 @@ do
|
||||
update_clients_num = update_clients_num + 1;
|
||||
end
|
||||
if not(update_frame) then
|
||||
update_frame = CreateFrame("FRAME");
|
||||
update_frame = CreateFrame("Frame");
|
||||
end
|
||||
if not(updating) then
|
||||
update_frame:SetScript("OnUpdate", function()
|
||||
@@ -1885,7 +1885,7 @@ do
|
||||
|
||||
function WeakAuras.InitSwingTimer()
|
||||
if not(swingTimerFrame) then
|
||||
swingTimerFrame = CreateFrame("frame");
|
||||
swingTimerFrame = CreateFrame("Frame");
|
||||
swingTimerFrame:RegisterEvent("COMBAT_LOG_EVENT_UNFILTERED");
|
||||
swingTimerFrame:RegisterEvent("PLAYER_ENTER_COMBAT");
|
||||
swingTimerFrame:RegisterEvent("UNIT_ATTACK_SPEED");
|
||||
@@ -2084,7 +2084,7 @@ do
|
||||
local spellDetails = {}
|
||||
|
||||
function WeakAuras.InitCooldownReady()
|
||||
cdReadyFrame = CreateFrame("FRAME");
|
||||
cdReadyFrame = CreateFrame("Frame");
|
||||
WeakAuras.frames["Cooldown Trigger Handler"] = cdReadyFrame
|
||||
cdReadyFrame:RegisterEvent("RUNE_POWER_UPDATE");
|
||||
cdReadyFrame:RegisterEvent("RUNE_TYPE_UPDATE");
|
||||
@@ -3350,7 +3350,7 @@ do
|
||||
WeakAuras.frames["Pet Use Handler"] = petFrame;
|
||||
function WeakAuras.WatchForPetDeath()
|
||||
if not(petFrame) then
|
||||
petFrame = CreateFrame("frame");
|
||||
petFrame = CreateFrame("Frame");
|
||||
petFrame:RegisterEvent("UNIT_PET")
|
||||
petFrame:SetScript("OnEvent", function(_, event, unit)
|
||||
if unit ~= "player" then return end
|
||||
@@ -3445,7 +3445,7 @@ do
|
||||
|
||||
function WeakAuras.WatchForMounts()
|
||||
if not(mountedFrame) then
|
||||
mountedFrame = CreateFrame("frame");
|
||||
mountedFrame = CreateFrame("Frame");
|
||||
WeakAuras.frames["Mount Use Handler"] = mountedFrame;
|
||||
mountedFrame:RegisterEvent("COMPANION_UPDATE");
|
||||
mountedFrame:SetScript("OnEvent", function()
|
||||
@@ -3472,7 +3472,7 @@ do
|
||||
|
||||
function WeakAuras.WatchPlayerMoveSpeed()
|
||||
if not (playerMovingFrame) then
|
||||
playerMovingFrame = CreateFrame("frame");
|
||||
playerMovingFrame = CreateFrame("Frame");
|
||||
WeakAuras.frames["Player Moving Frame"] = playerMovingFrame;
|
||||
end
|
||||
playerMovingFrame.speed = GetUnitSpeed("player")
|
||||
@@ -3567,7 +3567,7 @@ end
|
||||
local itemCountWatchFrame;
|
||||
function WeakAuras.RegisterItemCountWatch()
|
||||
if not(itemCountWatchFrame) then
|
||||
itemCountWatchFrame = CreateFrame("frame");
|
||||
itemCountWatchFrame = CreateFrame("Frame");
|
||||
itemCountWatchFrame:RegisterEvent("UNIT_SPELLCAST_SUCCEEDED");
|
||||
itemCountWatchFrame:SetScript("OnEvent", function(_, _, unit)
|
||||
if unit ~= "player" then return end
|
||||
@@ -3604,7 +3604,7 @@ do
|
||||
|
||||
function WeakAuras.WatchQueuedAction()
|
||||
if not(queuedActionFrame) then
|
||||
queuedActionFrame = CreateFrame("frame");
|
||||
queuedActionFrame = CreateFrame("Frame");
|
||||
WeakAuras.frames["Queued Action Frame"] = queuedActionFrame
|
||||
for slotID = 1, 120 do
|
||||
local spellID = GetActionSpellID(slotID)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, Private = ...
|
||||
|
||||
local WeakAuras = WeakAuras
|
||||
|
||||
+54
-3
@@ -33,13 +33,64 @@ WeakAuras.prettyPrint = function(...)
|
||||
print("|cff9900ffWeakAuras:|r ", ...)
|
||||
end
|
||||
|
||||
-- Force enable WeakAurasCompanion and Archive because some addon managers interfere with it
|
||||
EnableAddOn("WeakAurasCompanion")
|
||||
EnableAddOn("WeakAurasArchive")
|
||||
|
||||
local libsAreOk = true
|
||||
do
|
||||
local StandAloneLibs = {
|
||||
"Archivist",
|
||||
"LibStub"
|
||||
}
|
||||
local LibStubLibs = {
|
||||
"CallbackHandler-1.0",
|
||||
"AceConfig-3.0",
|
||||
"AceConsole-3.0",
|
||||
"AceGUI-3.0",
|
||||
"AceEvent-3.0",
|
||||
"AceGUISharedMediaWidgets-1.0",
|
||||
"AceTimer-3.0",
|
||||
"AceSerializer-3.0",
|
||||
"AceComm-3.0",
|
||||
"LibSharedMedia-3.0",
|
||||
"LibDataBroker-1.1",
|
||||
"LibCompress",
|
||||
"SpellRange-1.0",
|
||||
"LibCustomGlow-1.0",
|
||||
"LibDBIcon-1.0",
|
||||
"LibGetFrame-1.0",
|
||||
"LibSerialize",
|
||||
}
|
||||
for _, lib in ipairs(StandAloneLibs) do
|
||||
if not lib then
|
||||
libsAreOk = false
|
||||
WeakAuras.prettyPrint("Missing library:", lib)
|
||||
end
|
||||
end
|
||||
if LibStub then
|
||||
for _, lib in ipairs(LibStubLibs) do
|
||||
if not LibStub:GetLibrary(lib, true) then
|
||||
libsAreOk = false
|
||||
WeakAuras.prettyPrint("Missing library:", lib)
|
||||
end
|
||||
end
|
||||
else
|
||||
libsAreOk = false
|
||||
end
|
||||
end
|
||||
|
||||
function WeakAuras.IsLibsOK()
|
||||
return libsAreOk
|
||||
end
|
||||
|
||||
if versionString ~= versionStringFromToc and versionStringFromToc ~= "Dev" then
|
||||
WeakAuras.prettyPrint("You need to restart your game client to complete the WeakAuras update!")
|
||||
end
|
||||
|
||||
-- Force enable WeakAurasCompanion and Archive because some addon managers interfere with it
|
||||
EnableAddOn("WeakAurasCompanion")
|
||||
EnableAddOn("WeakAurasArchive")
|
||||
if not WeakAuras.IsLibsOK() then
|
||||
WeakAuras.prettyPrint("WeakAuras is missing necessary libraries. Please reinstall a proper package.")
|
||||
end
|
||||
|
||||
-- These function stubs are defined here to reduce the number of errors that occur if WeakAuras.lua fails to compile
|
||||
function WeakAuras.RegisterRegionType()
|
||||
|
||||
@@ -713,7 +713,7 @@ do
|
||||
button:SetScript("OnLeave",Control_OnLeave)
|
||||
button:SetScript("OnClick",Dropdown_TogglePullout)
|
||||
|
||||
local button_cover = CreateFrame("BUTTON",nil,self.frame)
|
||||
local button_cover = CreateFrame("Button",nil,self.frame)
|
||||
self.button_cover = button_cover
|
||||
button_cover.obj = self
|
||||
button_cover:SetPoint("TOPLEFT",self.frame,"BOTTOMLEFT",0,25)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not(GetLocale() == "deDE") then
|
||||
if GetLocale() ~= "deDE" then
|
||||
return
|
||||
end
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not(GetLocale() == "esES") then
|
||||
if GetLocale() ~= "esES" then
|
||||
return
|
||||
end
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not(GetLocale() == "esMX") then
|
||||
if GetLocale() ~= "esMX" then
|
||||
return
|
||||
end
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not(GetLocale() == "frFR") then
|
||||
if GetLocale() ~= "frFR" then
|
||||
return
|
||||
end
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not(GetLocale() == "itIT") then
|
||||
if GetLocale() ~= "itIT" then
|
||||
return
|
||||
end
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not(GetLocale() == "koKR") then
|
||||
if GetLocale() ~= "koKR" then
|
||||
return
|
||||
end
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not(GetLocale() == "ptBR") then
|
||||
if GetLocale() ~= "ptBR" then
|
||||
return
|
||||
end
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not(GetLocale() == "ruRU") then
|
||||
if GetLocale() ~= "ruRU" then
|
||||
return
|
||||
end
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not(GetLocale() == "zhCN") then
|
||||
if GetLocale() ~= "zhCN" then
|
||||
return
|
||||
end
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not(GetLocale() == "zhTW") then
|
||||
if GetLocale() ~= "zhTW" then
|
||||
return
|
||||
end
|
||||
|
||||
|
||||
+12
-1
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, Private = ...
|
||||
local L = WeakAuras.L
|
||||
|
||||
@@ -1160,6 +1160,17 @@ function Private.Modernize(data)
|
||||
end
|
||||
end
|
||||
|
||||
if (data.internalVersion < 51) then
|
||||
for _, triggerData in ipairs(data.triggers) do
|
||||
if triggerData.trigger.event == "Threat Situation" then
|
||||
triggerData.trigger.unit = triggerData.trigger.threatUnit
|
||||
triggerData.trigger.use_unit = triggerData.trigger.use_threatUnit
|
||||
triggerData.trigger.threatUnit = nil
|
||||
triggerData.trigger.use_threatUnit = nil
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
if (data.internalVersion < 52) then
|
||||
local function matchTarget(input)
|
||||
return input == "target" or input == "'target'" or input == "\"target\"" or input == "%t" or input == "'%t'" or input == "\"%t\""
|
||||
|
||||
+12
-8
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, Private = ...
|
||||
|
||||
local WeakAuras = WeakAuras
|
||||
@@ -446,14 +446,10 @@ function WeakAuras.PrintProfile()
|
||||
PrintOneProfile(popup, "|cff9900ffTotal time:|r", profileData.systems.time)
|
||||
PrintOneProfile(popup, "|cff9900ffTime inside WA:|r", profileData.systems.wa)
|
||||
popup:AddText(string.format("|cff9900ffTime spent inside WA:|r %.2f%%", 100 * profileData.systems.wa.elapsed / profileData.systems.time.elapsed))
|
||||
popup:AddText("")
|
||||
popup:AddText("|cff9900ffSystems:|r")
|
||||
|
||||
for i, k in ipairs(SortProfileMap(profileData.systems)) do
|
||||
if (k ~= "time" and k ~= "wa") then
|
||||
PrintOneProfile(popup, k, profileData.systems[k], profileData.systems.wa.elapsed)
|
||||
end
|
||||
end
|
||||
popup:AddText("")
|
||||
popup:AddText("Note: Not every aspect of each aura can be tracked.")
|
||||
popup:AddText("You can ask on our discord https://discord.gg/weakauras for help interpreting this output.")
|
||||
|
||||
popup:AddText("")
|
||||
popup:AddText("|cff9900ffAuras:|r")
|
||||
@@ -462,6 +458,14 @@ function WeakAuras.PrintProfile()
|
||||
for i, k in ipairs(SortProfileMap(profileData.auras)) do
|
||||
PrintOneProfile(popup, k, profileData.auras[k], total)
|
||||
end
|
||||
|
||||
popup:AddText("")
|
||||
popup:AddText("|cff9900ffSystems:|r")
|
||||
for i, k in ipairs(SortProfileMap(profileData.systems)) do
|
||||
if (k ~= "time" and k ~= "wa") then
|
||||
PrintOneProfile(popup, k, profileData.systems[k], profileData.systems.wa.elapsed)
|
||||
end
|
||||
end
|
||||
popup:Show()
|
||||
end
|
||||
|
||||
|
||||
+23
-18
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, Private = ...
|
||||
|
||||
-- Lua APIs
|
||||
@@ -133,7 +133,7 @@ Private.function_strings = {
|
||||
]]
|
||||
};
|
||||
|
||||
local hsvFrame = CreateFrame("Colorselect")
|
||||
local hsvFrame = CreateFrame("ColorSelect")
|
||||
|
||||
-- HSV transition, for a much prettier color transition in many cases
|
||||
-- see http://www.wowinterface.com/forums/showthread.php?t=48236
|
||||
@@ -1084,7 +1084,7 @@ Private.load_prototype = {
|
||||
multiEntry = {
|
||||
operator = "or"
|
||||
},
|
||||
test = "IsEquippedItem(%s)",
|
||||
test = "IsEquippedItem(GetItemInfo(%s))",
|
||||
events = { "UNIT_INVENTORY_CHANGED", "PLAYER_EQUIPMENT_CHANGED"}
|
||||
},
|
||||
{
|
||||
@@ -1094,7 +1094,7 @@ Private.load_prototype = {
|
||||
multiEntry = {
|
||||
operator = "or"
|
||||
},
|
||||
test = "not IsEquippedItem(%s)",
|
||||
test = "not IsEquippedItem(GetItemInfo(%s))",
|
||||
events = { "UNIT_INVENTORY_CHANGED", "PLAYER_EQUIPMENT_CHANGED"}
|
||||
},
|
||||
}
|
||||
@@ -5440,7 +5440,7 @@ Private.event_prototypes = {
|
||||
|
||||
local ret = [[
|
||||
local inverse = %s;
|
||||
local equipped = IsEquippedItem(%s);
|
||||
local equipped = IsEquippedItem(GetItemInfo(%s));
|
||||
]];
|
||||
|
||||
return ret:format(trigger.use_inverse and "true" or "false", itemName);
|
||||
@@ -5555,18 +5555,20 @@ Private.event_prototypes = {
|
||||
["Threat Situation"] = {
|
||||
type = "unit",
|
||||
events = function(trigger)
|
||||
local unit = trigger.unit
|
||||
local result = {}
|
||||
if trigger.threatUnit and trigger.threatUnit ~= "none" then
|
||||
AddUnitEventForEvents(result, trigger.threatUnit, "UNIT_THREAT_LIST_UPDATE")
|
||||
if unit and unit ~= "none" then
|
||||
AddUnitEventForEvents(result, unit, "UNIT_THREAT_LIST_UPDATE")
|
||||
else
|
||||
AddUnitEventForEvents(result, "player", "UNIT_THREAT_SITUATION_UPDATE")
|
||||
end
|
||||
return result
|
||||
end,
|
||||
internal_events = function(trigger)
|
||||
local unit = trigger.unit
|
||||
local result = {}
|
||||
if trigger.threatUnit and trigger.threatUnit ~= "none" then
|
||||
AddUnitChangeInternalEvents(trigger.threatUnit, result)
|
||||
if unit and unit ~= "none" then
|
||||
AddUnitChangeInternalEvents(unit, result)
|
||||
end
|
||||
return result
|
||||
end,
|
||||
@@ -5576,14 +5578,15 @@ Private.event_prototypes = {
|
||||
AddWatchedUnits(unit)
|
||||
end
|
||||
end,
|
||||
force_events = "UNIT_THREAT_LIST_UPDATE",
|
||||
force_events = unitHelperFunctions.UnitChangedForceEvents,
|
||||
name = L["Threat Situation"],
|
||||
init = function(trigger)
|
||||
trigger.unit = trigger.unit or "target";
|
||||
local ret = [[
|
||||
local unit = %s
|
||||
unit = string.lower(unit)
|
||||
local ok = true
|
||||
local aggro, status, threatpct, rawthreatpct, threatvalue, threattotal
|
||||
if unit then
|
||||
if unit and unit ~= "none" then
|
||||
aggro, status, threatpct, rawthreatpct, threatvalue = WeakAuras.UnitDetailedThreatSituation('player', unit)
|
||||
threattotal = (threatvalue or 0) * 100 / (threatpct ~= 0 and threatpct or 1)
|
||||
else
|
||||
@@ -5592,18 +5595,20 @@ Private.event_prototypes = {
|
||||
threatpct, rawthreatpct, threatvalue, threattotal = 100, 100, 0, 100
|
||||
end
|
||||
]];
|
||||
return ret:format(trigger.threatUnit and trigger.threatUnit ~= "none" and "[["..trigger.threatUnit.."]]" or "nil");
|
||||
return ret;
|
||||
end,
|
||||
canHaveDuration = true,
|
||||
statesParameter = "one",
|
||||
statesParameter = "unit",
|
||||
args = {
|
||||
{
|
||||
name = "threatUnit",
|
||||
name = "unit",
|
||||
display = L["Unit"],
|
||||
required = true,
|
||||
type = "unit",
|
||||
init = "arg",
|
||||
values = "threat_unit_types",
|
||||
test = "true",
|
||||
store = true,
|
||||
default = "target"
|
||||
},
|
||||
{
|
||||
@@ -5628,7 +5633,7 @@ Private.event_prototypes = {
|
||||
type = "number",
|
||||
store = true,
|
||||
conditionType = "number",
|
||||
enable = function(trigger) return trigger.threatUnit ~= "none" end,
|
||||
enable = function(trigger) return trigger.unit ~= "none" end,
|
||||
multiEntry = {
|
||||
operator = "and",
|
||||
limit = 2
|
||||
@@ -5641,7 +5646,7 @@ Private.event_prototypes = {
|
||||
type = "number",
|
||||
store = true,
|
||||
conditionType = "number",
|
||||
enable = function(trigger) return trigger.threatUnit ~= "none" end,
|
||||
enable = function(trigger) return trigger.unit ~= "none" end,
|
||||
multiEntry = {
|
||||
operator = "and",
|
||||
limit = 2
|
||||
@@ -5654,7 +5659,7 @@ Private.event_prototypes = {
|
||||
type = "number",
|
||||
store = true,
|
||||
conditionType = "number",
|
||||
enable = function(trigger) return trigger.threatUnit ~= "none" end,
|
||||
enable = function(trigger) return trigger.unit ~= "none" end,
|
||||
multiEntry = {
|
||||
operator = "and",
|
||||
limit = 2
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, Private = ...
|
||||
|
||||
local SharedMedia = LibStub("LibSharedMedia-3.0");
|
||||
@@ -1004,19 +1004,19 @@ end
|
||||
-- Called when first creating a new region/display
|
||||
local function create(parent)
|
||||
-- Create overall region (containing everything else)
|
||||
local region = CreateFrame("FRAME", nil, parent);
|
||||
local region = CreateFrame("Frame", nil, parent);
|
||||
region.regionType = "aurabar"
|
||||
region:SetMovable(true);
|
||||
region:SetResizable(true);
|
||||
region:SetMinResize(1, 1);
|
||||
|
||||
-- Create statusbar (inherit prototype)
|
||||
local bar = CreateFrame("FRAME", nil, region);
|
||||
local bar = CreateFrame("Frame", nil, region);
|
||||
WeakAuras.Mixin(bar, SmoothStatusBarMixin);
|
||||
local fg = bar:CreateTexture(nil, "BORDER");
|
||||
local bg = bar:CreateTexture(nil, "BACKGROUND");
|
||||
bg:SetAllPoints();
|
||||
local fgFrame = CreateFrame("FRAME", nil, bar)
|
||||
local fgFrame = CreateFrame("Frame", nil, bar)
|
||||
local spark = bar:CreateTexture(nil, "ARTWORK");
|
||||
bar.fg = fg;
|
||||
bar.fgFrame = fgFrame
|
||||
@@ -1031,7 +1031,7 @@ local function create(parent)
|
||||
region.bar = bar;
|
||||
|
||||
-- Create icon
|
||||
local iconFrame = CreateFrame("FRAME", nil, region);
|
||||
local iconFrame = CreateFrame("Frame", nil, region);
|
||||
region.iconFrame = iconFrame;
|
||||
local icon = iconFrame:CreateTexture(nil, "OVERLAY");
|
||||
region.icon = icon;
|
||||
@@ -1187,7 +1187,7 @@ local function modify(parent, region, data)
|
||||
if tooltipType and data.useTooltip then
|
||||
-- Create and enable tooltip-hover frame
|
||||
if not region.tooltipFrame then
|
||||
region.tooltipFrame = CreateFrame("frame", nil, region);
|
||||
region.tooltipFrame = CreateFrame("Frame", nil, region);
|
||||
region.tooltipFrame:SetAllPoints(icon);
|
||||
region.tooltipFrame:SetScript("OnEnter", function()
|
||||
Private.ShowMouseoverTooltip(region, region.tooltipFrame);
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, Private = ...
|
||||
|
||||
local WeakAuras = WeakAuras
|
||||
@@ -79,7 +79,7 @@ local controlPointFunctions = {
|
||||
}
|
||||
|
||||
local function createControlPoint(self)
|
||||
local controlPoint = CreateFrame("FRAME", nil, self.parent)
|
||||
local controlPoint = CreateFrame("Frame", nil, self.parent)
|
||||
WeakAuras.Mixin(controlPoint, controlPointFunctions)
|
||||
|
||||
controlPoint:SetWidth(16)
|
||||
@@ -103,14 +103,14 @@ local function releaseControlPoint(self, controlPoint)
|
||||
end
|
||||
|
||||
local function create(parent)
|
||||
local region = CreateFrame("FRAME", nil, parent)
|
||||
local region = CreateFrame("Frame", nil, parent)
|
||||
region.regionType = "dynamicgroup"
|
||||
region:SetSize(16, 16)
|
||||
region:SetMovable(true)
|
||||
region.sortedChildren = {}
|
||||
region.controlledChildren = {}
|
||||
region.updatedChildren = {}
|
||||
local background = CreateFrame("frame", nil, region)
|
||||
local background = CreateFrame("Frame", nil, region)
|
||||
region.background = background
|
||||
region.selfPoint = "TOPLEFT"
|
||||
region.controlPoints = CreateObjectPool(createControlPoint, releaseControlPoint)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, Private = ...
|
||||
|
||||
local SharedMedia = LibStub("LibSharedMedia-3.0");
|
||||
@@ -25,14 +25,14 @@ local default = {
|
||||
-- Called when first creating a new region/display
|
||||
local function create(parent)
|
||||
-- Main region
|
||||
local region = CreateFrame("FRAME", nil, parent);
|
||||
local region = CreateFrame("Frame", nil, parent);
|
||||
region.regionType = "group"
|
||||
region:SetMovable(true);
|
||||
region:SetWidth(2);
|
||||
region:SetHeight(2);
|
||||
|
||||
-- Border region
|
||||
local border = CreateFrame("frame", nil, region);
|
||||
local border = CreateFrame("Frame", nil, region);
|
||||
region.border = border;
|
||||
|
||||
WeakAuras.regionPrototype.create(region);
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, Private = ...
|
||||
|
||||
local SharedMedia = LibStub("LibSharedMedia-3.0");
|
||||
@@ -143,7 +143,7 @@ local function AnchorSubRegion(self, subRegion, anchorType, selfPoint, anchorPoi
|
||||
local anchorRegion = self.icon
|
||||
if anchorPoint:sub(1, 6) == "INNER_" then
|
||||
if not self.inner then
|
||||
self.inner = CreateFrame("FRAME", nil, self)
|
||||
self.inner = CreateFrame("Frame", nil, self)
|
||||
self.inner:SetPoint("CENTER")
|
||||
self.UpdateInnerOuterSize()
|
||||
end
|
||||
@@ -151,7 +151,7 @@ local function AnchorSubRegion(self, subRegion, anchorType, selfPoint, anchorPoi
|
||||
anchorPoint = anchorPoint:sub(7)
|
||||
elseif anchorPoint:sub(1, 6) == "OUTER_" then
|
||||
if not self.outer then
|
||||
self.outer = CreateFrame("FRAME", nil, self)
|
||||
self.outer = CreateFrame("Frame", nil, self)
|
||||
self.outer:SetPoint("CENTER")
|
||||
self.UpdateInnerOuterSize()
|
||||
end
|
||||
@@ -243,7 +243,7 @@ end
|
||||
local function create(parent, data)
|
||||
local font = "GameFontHighlight";
|
||||
|
||||
local region = CreateFrame("FRAME", nil, parent);
|
||||
local region = CreateFrame("Frame", nil, parent);
|
||||
region.regionType = "icon"
|
||||
region:SetMovable(true);
|
||||
region:SetResizable(true);
|
||||
@@ -312,7 +312,7 @@ local function create(parent, data)
|
||||
end
|
||||
region.frameId = frameId;
|
||||
|
||||
local cooldown = CreateFrame("COOLDOWN", "WeakAurasCooldown"..frameId, region, "CooldownFrameTemplate");
|
||||
local cooldown = CreateFrame("Cooldown", "WeakAurasCooldown"..frameId, region, "CooldownFrameTemplate");
|
||||
region.cooldown = cooldown;
|
||||
cooldown:SetAllPoints(icon);
|
||||
|
||||
@@ -428,7 +428,7 @@ local function modify(parent, region, data)
|
||||
local tooltipType = Private.CanHaveTooltip(data);
|
||||
if(tooltipType and data.useTooltip) then
|
||||
if not region.tooltipFrame then
|
||||
region.tooltipFrame = CreateFrame("frame", nil, region);
|
||||
region.tooltipFrame = CreateFrame("Frame", nil, region);
|
||||
region.tooltipFrame:SetAllPoints(region);
|
||||
region.tooltipFrame:SetScript("OnEnter", function()
|
||||
Private.ShowMouseoverTooltip(region, region);
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, Private = ...
|
||||
|
||||
local SharedMedia = LibStub("LibSharedMedia-3.0");
|
||||
@@ -69,14 +69,14 @@ local regionFunctions = {
|
||||
-- Called when first creating a new region/display
|
||||
local function create(parent)
|
||||
-- Main region
|
||||
local region = CreateFrame("FRAME", nil, UIParent);
|
||||
local region = CreateFrame("Frame", nil, UIParent);
|
||||
region.regionType = "model"
|
||||
region:SetMovable(true);
|
||||
region:SetResizable(true);
|
||||
region:SetMinResize(1, 1);
|
||||
|
||||
-- Border region
|
||||
local border = CreateFrame("frame", nil, region);
|
||||
local border = CreateFrame("Frame", nil, region);
|
||||
region.border = border;
|
||||
|
||||
WeakAuras.regionPrototype.create(region);
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, Private = ...
|
||||
|
||||
local L = WeakAuras.L;
|
||||
@@ -424,7 +424,7 @@ WeakAuras.createSpinner = createSpinner;
|
||||
local function create(parent)
|
||||
local font = "GameFontHighlight";
|
||||
|
||||
local region = CreateFrame("FRAME", nil, parent);
|
||||
local region = CreateFrame("Frame", nil, parent);
|
||||
region.regionType = "progresstexture"
|
||||
region:SetMovable(true);
|
||||
region:SetResizable(true);
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, Private = ...
|
||||
|
||||
local WeakAuras = WeakAuras;
|
||||
@@ -624,7 +624,7 @@ end
|
||||
|
||||
local regionsForFrameTick = {}
|
||||
|
||||
local frameForFrameTick = CreateFrame("FRAME");
|
||||
local frameForFrameTick = CreateFrame("Frame");
|
||||
|
||||
WeakAuras.frames["Frame Tick Frame"] = frameForFrameTick
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, Private = ...
|
||||
|
||||
local texture_types = WeakAuras.StopMotion.texture_types;
|
||||
@@ -90,7 +90,7 @@ local properties = {
|
||||
WeakAuras.regionPrototype.AddProperties(properties, default);
|
||||
|
||||
local function create(parent)
|
||||
local frame = CreateFrame("FRAME", nil, UIParent);
|
||||
local frame = CreateFrame("Frame", nil, UIParent);
|
||||
frame.regionType = "stopmotion"
|
||||
frame:SetMovable(true);
|
||||
frame:SetResizable(true);
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, Private = ...
|
||||
|
||||
local SharedMedia = LibStub("LibSharedMedia-3.0");
|
||||
@@ -54,7 +54,7 @@ local function GetProperties(data)
|
||||
end
|
||||
|
||||
local function create(parent)
|
||||
local region = CreateFrame("FRAME", nil, parent);
|
||||
local region = CreateFrame("Frame", nil, parent);
|
||||
region.regionType = "text"
|
||||
region:SetMovable(true);
|
||||
|
||||
@@ -98,7 +98,7 @@ local function modify(parent, region, data)
|
||||
local tooltipType = Private.CanHaveTooltip(data);
|
||||
if(tooltipType and data.useTooltip) then
|
||||
if not region.tooltipFrame then
|
||||
region.tooltipFrame = CreateFrame("frame", nil, region);
|
||||
region.tooltipFrame = CreateFrame("Frame", nil, region);
|
||||
region.tooltipFrame:SetAllPoints(region);
|
||||
region.tooltipFrame:SetScript("OnEnter", function()
|
||||
Private.ShowMouseoverTooltip(region, region);
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, Private = ...
|
||||
|
||||
local L = WeakAuras.L;
|
||||
@@ -68,7 +68,7 @@ local properties = {
|
||||
WeakAuras.regionPrototype.AddProperties(properties, default);
|
||||
|
||||
local function create(parent)
|
||||
local region = CreateFrame("FRAME", nil, UIParent);
|
||||
local region = CreateFrame("Frame", nil, UIParent);
|
||||
region.regionType = "texture"
|
||||
region:SetMovable(true);
|
||||
region:SetResizable(true);
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, Private = ...
|
||||
local L = WeakAuras.L;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, Private = ...
|
||||
|
||||
local SharedMedia = LibStub("LibSharedMedia-3.0");
|
||||
@@ -34,7 +34,7 @@ local properties = {
|
||||
|
||||
|
||||
local function create()
|
||||
return CreateFrame("FRAME", nil, UIParent)
|
||||
return CreateFrame("Frame", nil, UIParent)
|
||||
end
|
||||
|
||||
local function onAcquire(subRegion)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, Private = ...
|
||||
|
||||
local SharedMedia = LibStub("LibSharedMedia-3.0");
|
||||
@@ -297,7 +297,7 @@ local funcs = {
|
||||
}
|
||||
|
||||
local function create()
|
||||
local region = CreateFrame("FRAME", nil, UIParent)
|
||||
local region = CreateFrame("Frame", nil, UIParent)
|
||||
|
||||
for name, func in pairs(funcs) do
|
||||
region[name] = func
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, Private = ...
|
||||
|
||||
local SharedMedia = LibStub("LibSharedMedia-3.0");
|
||||
@@ -155,7 +155,7 @@ local funcs = {
|
||||
}
|
||||
|
||||
local function create()
|
||||
local subRegion = CreateFrame("FRAME", nil, UIParent)
|
||||
local subRegion = CreateFrame("Frame", nil, UIParent)
|
||||
--subRegion:SetClipsChildren(true)
|
||||
|
||||
for k, v in pairs(funcs) do
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, Private = ...
|
||||
|
||||
local SharedMedia = LibStub("LibSharedMedia-3.0");
|
||||
@@ -101,7 +101,7 @@ local properties = {
|
||||
}
|
||||
|
||||
local function create()
|
||||
local region = CreateFrame("FRAME", nil, UIParent);
|
||||
local region = CreateFrame("Frame", nil, UIParent);
|
||||
|
||||
local text = region:CreateFontString(nil, "OVERLAY");
|
||||
region.text = text;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, Private = ...
|
||||
|
||||
local SharedMedia = LibStub("LibSharedMedia-3.0");
|
||||
@@ -107,7 +107,7 @@ local auraBarAnchorInverse = {
|
||||
}
|
||||
|
||||
local function create()
|
||||
local subRegion = CreateFrame("FRAME", nil, UIParent)
|
||||
local subRegion = CreateFrame("Frame", nil, UIParent)
|
||||
subRegion.texture = subRegion:CreateTexture()
|
||||
subRegion.texture:SetDrawLayer("ARTWORK", 3)
|
||||
subRegion.texture:SetAllPoints(subRegion)
|
||||
|
||||
@@ -18,7 +18,7 @@ Imports an aura from a table, which may or may not be encoded as a B64 string.
|
||||
If target is installed data, or is a uid which points to installed data, then the import will be an update to that aura
|
||||
|
||||
]]--
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, Private = ...
|
||||
|
||||
-- Lua APIs
|
||||
|
||||
+5
-5
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, Private = ...
|
||||
|
||||
local WeakAuras = WeakAuras;
|
||||
@@ -150,8 +150,8 @@ local simpleFormatters = {
|
||||
local fmt, time = SecondsToTimeAbbrev(value)
|
||||
-- Remove the space between the value and unit
|
||||
return fmt:gsub(" ", ""):format(time)
|
||||
end
|
||||
}
|
||||
end,
|
||||
},
|
||||
}
|
||||
|
||||
Private.format_types = {
|
||||
@@ -257,7 +257,7 @@ Private.format_types = {
|
||||
if value < threshold then
|
||||
return string.format(formatString, value)
|
||||
else
|
||||
return mainFormater(value, state)
|
||||
return mainFormater(value)
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -874,7 +874,7 @@ local function update_forms()
|
||||
end
|
||||
end
|
||||
end
|
||||
local form_frame = CreateFrame("frame");
|
||||
local form_frame = CreateFrame("Frame");
|
||||
form_frame:RegisterEvent("UPDATE_SHAPESHIFT_FORMS")
|
||||
form_frame:RegisterEvent("PLAYER_LOGIN")
|
||||
form_frame:SetScript("OnEvent", update_forms);
|
||||
|
||||
+12
-12
@@ -30,7 +30,7 @@ LibStub("AceTimer-3.0"):Embed(WeakAurasTimers)
|
||||
|
||||
Private.watched_trigger_events = {}
|
||||
|
||||
-- The worlds simplest callback system
|
||||
-- The worlds simplest callback system.
|
||||
-- That supports 1:N, but no deregistration and breaks if registrating in a callback
|
||||
Private.callbacks = {}
|
||||
Private.callbacks.events = {}
|
||||
@@ -141,7 +141,7 @@ function SlashCmdList.WEAKAURAS(input)
|
||||
end
|
||||
end
|
||||
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
|
||||
function Private.ToggleMinimap()
|
||||
WeakAurasSaved.minimap.hide = not WeakAurasSaved.minimap.hide
|
||||
@@ -913,7 +913,7 @@ local function tooltip_draw()
|
||||
tooltip:Show();
|
||||
end
|
||||
|
||||
local colorFrame = CreateFrame("frame");
|
||||
local colorFrame = CreateFrame("Frame");
|
||||
WeakAuras.frames["LDB Icon Recoloring"] = colorFrame;
|
||||
|
||||
local colorElapsed = 0;
|
||||
@@ -921,7 +921,7 @@ local colorDelay = 2;
|
||||
local r, g, b = 0.8, 0, 1;
|
||||
local r2, g2, b2 = random(2)-1, random(2)-1, random(2)-1;
|
||||
|
||||
local tooltip_update_frame = CreateFrame("FRAME");
|
||||
local tooltip_update_frame = CreateFrame("Frame");
|
||||
WeakAuras.frames["LDB Tooltip Updater"] = tooltip_update_frame;
|
||||
|
||||
-- function copied from LibDBIcon-1.0.lua
|
||||
@@ -1102,12 +1102,12 @@ function Private.Login(initialTime, takeNewSnapshots)
|
||||
end
|
||||
end
|
||||
|
||||
local WeakAurasFrame = CreateFrame("FRAME", "WeakAurasFrame", UIParent);
|
||||
local WeakAurasFrame = CreateFrame("Frame", "WeakAurasFrame", UIParent);
|
||||
WeakAuras.frames["WeakAuras Main Frame"] = WeakAurasFrame;
|
||||
WeakAurasFrame:SetAllPoints(UIParent);
|
||||
WeakAurasFrame:SetFrameStrata("BACKGROUND");
|
||||
|
||||
local loadedFrame = CreateFrame("FRAME");
|
||||
local loadedFrame = CreateFrame("Frame");
|
||||
WeakAuras.frames["Addon Initialization Handler"] = loadedFrame;
|
||||
loadedFrame:RegisterEvent("ADDON_LOADED");
|
||||
loadedFrame:RegisterEvent("PLAYER_LOGIN");
|
||||
@@ -1446,7 +1446,7 @@ function Private.ScanForLoads(toCheck, event, arg1, ...)
|
||||
scanForLoadsImpl(toCheck, event, arg1, ...)
|
||||
end
|
||||
|
||||
local loadFrame = CreateFrame("FRAME");
|
||||
local loadFrame = CreateFrame("Frame");
|
||||
WeakAuras.loadFrame = loadFrame;
|
||||
WeakAuras.frames["Display Load Handling"] = loadFrame;
|
||||
|
||||
@@ -1473,7 +1473,7 @@ loadFrame:RegisterEvent("PLAYER_UNGHOST")
|
||||
loadFrame:RegisterEvent("PLAYER_FLAGS_CHANGED")
|
||||
loadFrame:RegisterEvent("PARTY_LEADER_CHANGED")
|
||||
|
||||
local unitLoadFrame = CreateFrame("FRAME");
|
||||
local unitLoadFrame = CreateFrame("Frame");
|
||||
WeakAuras.unitLoadFrame = unitLoadFrame;
|
||||
WeakAuras.frames["Display Load Handling 2"] = unitLoadFrame;
|
||||
|
||||
@@ -3564,7 +3564,7 @@ end
|
||||
local dynFrame = {};
|
||||
do
|
||||
-- Internal data
|
||||
dynFrame.frame = CreateFrame("frame");
|
||||
dynFrame.frame = CreateFrame("Frame");
|
||||
dynFrame.update = {};
|
||||
dynFrame.size = 0;
|
||||
|
||||
@@ -4474,12 +4474,12 @@ local function ensureMouseFrame()
|
||||
if (mouseFrame) then
|
||||
return;
|
||||
end
|
||||
mouseFrame = CreateFrame("FRAME", "WeakAurasAttachToMouseFrame", UIParent);
|
||||
mouseFrame = CreateFrame("Frame", "WeakAurasAttachToMouseFrame", UIParent);
|
||||
mouseFrame.attachedVisibleFrames = {};
|
||||
mouseFrame:SetWidth(1);
|
||||
mouseFrame:SetHeight(1);
|
||||
|
||||
local moverFrame = CreateFrame("FRAME", "WeakAurasMousePointerFrame", mouseFrame);
|
||||
local moverFrame = CreateFrame("Frame", "WeakAurasMousePointerFrame", mouseFrame);
|
||||
mouseFrame.moverFrame = moverFrame;
|
||||
moverFrame:SetPoint("TOPLEFT", mouseFrame, "CENTER");
|
||||
moverFrame:SetWidth(32);
|
||||
@@ -4794,7 +4794,7 @@ local function postponeAnchor(id)
|
||||
end
|
||||
end
|
||||
|
||||
local HiddenFrames = CreateFrame("FRAME", "WeakAurasHiddenFrames")
|
||||
local HiddenFrames = CreateFrame("Frame", "WeakAurasHiddenFrames")
|
||||
HiddenFrames:Hide()
|
||||
WeakAuras.HiddenFrames = HiddenFrames
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ WeakAurasTreeGroup Container
|
||||
Container that uses a tree control to switch between groups.
|
||||
This file was forked from AceGUIContainer-TreeGroup.lua version 41
|
||||
-------------------------------------------------------------------------------]]
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
|
||||
local Type, Version = "WeakAurasTreeGroup", 2
|
||||
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
|
||||
local Type, Version = "WeakAurasAnchorButtons", 2
|
||||
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, OptionsPrivate = ...
|
||||
|
||||
local tinsert, tconcat, tremove, wipe = table.insert, table.concat, table.remove, wipe
|
||||
@@ -1855,7 +1855,7 @@ local function Constructor()
|
||||
renamebox:Hide();
|
||||
end);
|
||||
|
||||
local group = CreateFrame("BUTTON", nil, button);
|
||||
local group = CreateFrame("Button", nil, button);
|
||||
button.group = group;
|
||||
group:SetWidth(16);
|
||||
group:SetHeight(16);
|
||||
@@ -1870,7 +1870,7 @@ local function Constructor()
|
||||
group:SetScript("OnEnter", function() Show_Tooltip(button, L["Group (verb)"], L["Put this display in a group"]) end);
|
||||
group:SetScript("OnLeave", Hide_Tooltip);
|
||||
|
||||
local ungroup = CreateFrame("BUTTON", nil, button);
|
||||
local ungroup = CreateFrame("Button", nil, button);
|
||||
button.ungroup = ungroup;
|
||||
ungroup:SetWidth(11);
|
||||
ungroup:SetHeight(11);
|
||||
@@ -1885,7 +1885,7 @@ local function Constructor()
|
||||
ungroup:SetScript("OnLeave", Hide_Tooltip);
|
||||
ungroup:Hide();
|
||||
|
||||
local upgroup = CreateFrame("BUTTON", nil, button);
|
||||
local upgroup = CreateFrame("Button", nil, button);
|
||||
button.upgroup = upgroup;
|
||||
upgroup:SetWidth(11);
|
||||
upgroup:SetHeight(11);
|
||||
@@ -1902,7 +1902,7 @@ local function Constructor()
|
||||
upgroup:SetScript("OnLeave", Hide_Tooltip);
|
||||
upgroup:Hide();
|
||||
|
||||
local downgroup = CreateFrame("BUTTON", nil, button);
|
||||
local downgroup = CreateFrame("Button", nil, button);
|
||||
button.downgroup = downgroup;
|
||||
downgroup:SetWidth(11);
|
||||
downgroup:SetHeight(11);
|
||||
@@ -1918,7 +1918,7 @@ local function Constructor()
|
||||
downgroup:SetScript("OnLeave", Hide_Tooltip);
|
||||
downgroup:Hide();
|
||||
|
||||
local expand = CreateFrame("BUTTON", nil, button);
|
||||
local expand = CreateFrame("Button", nil, button);
|
||||
button.expand = expand;
|
||||
expand.expanded = true;
|
||||
expand.disabled = true;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
--[[-----------------------------------------------------------------------------
|
||||
Button Widget for our Expand button
|
||||
-------------------------------------------------------------------------------]]
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
|
||||
local Type, Version = "WeakAurasExpand", 3
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
--[[-----------------------------------------------------------------------------
|
||||
Anchor for a Expandable section
|
||||
-------------------------------------------------------------------------------]]
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, OptionsPrivate = ...
|
||||
local Type, Version = "WeakAurasExpandAnchor", 2
|
||||
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
--[[-----------------------------------------------------------------------------
|
||||
Button Widget for our Expand button
|
||||
-------------------------------------------------------------------------------]]
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, OptionsPrivate = ...
|
||||
|
||||
local Type, Version = "WeakAurasExpandSmall", 2
|
||||
|
||||
@@ -3,7 +3,7 @@ Icon Widget that allows for a tooltip, by preventing SetLabel from actually
|
||||
setting a label
|
||||
Graphical Button.
|
||||
-------------------------------------------------------------------------------]]
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
|
||||
local Type, Version = "WeakAurasIcon", 1
|
||||
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
|
||||
local Type, Version = "WeakAurasIconButton", 21
|
||||
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
|
||||
@@ -62,7 +62,7 @@ Constructor
|
||||
-------------------------------------------------------------------------------]]
|
||||
|
||||
local function Constructor()
|
||||
local button = CreateFrame("BUTTON", nil, UIParent);
|
||||
local button = CreateFrame("Button", nil, UIParent);
|
||||
button:SetHeight(52);
|
||||
button:SetWidth(52);
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
|
||||
local Type, Version = "WeakAurasImportButton", 20
|
||||
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
|
||||
@@ -124,7 +124,7 @@ Constructor
|
||||
|
||||
local function Constructor()
|
||||
local name = "WeakAurasImportButton"..AceGUI:GetNextWidgetNum(Type);
|
||||
local button = CreateFrame("BUTTON", name, UIParent, "OptionsListButtonTemplate");
|
||||
local button = CreateFrame("Button", name, UIParent, "OptionsListButtonTemplate");
|
||||
button:SetHeight(18);
|
||||
button:SetWidth(380);
|
||||
button.dgroup = nil;
|
||||
@@ -136,7 +136,7 @@ local function Constructor()
|
||||
background:SetVertexColor(0.5, 0.5, 0.5, 0.25);
|
||||
background:SetAllPoints(button);
|
||||
|
||||
local expand = CreateFrame("BUTTON", nil, button);
|
||||
local expand = CreateFrame("Button", nil, button);
|
||||
button.expand = expand;
|
||||
expand.expanded = true;
|
||||
expand.disabled = true;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
--[[-----------------------------------------------------------------------------
|
||||
Input Widget that allows to show an alternative text when it does not have focus
|
||||
-------------------------------------------------------------------------------]]
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
|
||||
local Type, Version = "WeakAurasInputFocus", 1
|
||||
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
|
||||
local Type, Version = "WeakAurasLoadedHeaderButton", 22
|
||||
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
|
||||
@@ -142,7 +142,7 @@ Constructor
|
||||
|
||||
local function Constructor()
|
||||
local name = Type..AceGUI:GetNextWidgetNum(Type)
|
||||
local button = CreateFrame("BUTTON", name, UIParent, "OptionsListButtonTemplate");
|
||||
local button = CreateFrame("Button", name, UIParent, "OptionsListButtonTemplate");
|
||||
button:SetHeight(20);
|
||||
button:SetWidth(1000);
|
||||
button:SetDisabledFontObject("GameFontNormal");
|
||||
@@ -154,7 +154,7 @@ local function Constructor()
|
||||
background:SetVertexColor(0.5, 0.5, 0.5, 0.6);
|
||||
background:SetAllPoints(button);
|
||||
|
||||
local expand = CreateFrame("BUTTON", nil, button);
|
||||
local expand = CreateFrame("Button", nil, button);
|
||||
button.expand = expand;
|
||||
expand.expanded = true;
|
||||
expand.disabled = true;
|
||||
@@ -172,7 +172,7 @@ local function Constructor()
|
||||
expand:SetScript("OnEnter", function() Show_Tooltip(button, expand.title, expand.desc) end);
|
||||
expand:SetScript("OnLeave", Hide_Tooltip);
|
||||
|
||||
local view = CreateFrame("BUTTON", nil, button);
|
||||
local view = CreateFrame("Button", nil, button);
|
||||
button.view = view;
|
||||
view:SetWidth(16);
|
||||
view:SetHeight(16);
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
|
||||
local Type, Version = "WeakAurasMultiLineEditBox", 35
|
||||
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
|
||||
-- based on the AceGUI widget, overwrites the enter handling
|
||||
local Type, Version = "WeakAuras-MultiLineEditBoxWithEnter", 1
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
|
||||
local Type, Version = "WeakAurasNewButton", 24
|
||||
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
|
||||
@@ -90,7 +90,7 @@ Constructor
|
||||
|
||||
local function Constructor()
|
||||
local name = "WeakAurasDisplayButton"..AceGUI:GetNextWidgetNum(Type);
|
||||
local button = CreateFrame("BUTTON", name, UIParent, "OptionsListButtonTemplate");
|
||||
local button = CreateFrame("Button", name, UIParent, "OptionsListButtonTemplate");
|
||||
button:SetHeight(40);
|
||||
button:SetWidth(380);
|
||||
button.dgroup = nil;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
|
||||
local Type, Version = "WeakAurasNewHeaderButton", 20
|
||||
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
|
||||
@@ -56,7 +56,7 @@ Constructor
|
||||
|
||||
local function Constructor()
|
||||
local name = Type..AceGUI:GetNextWidgetNum(Type)
|
||||
local button = CreateFrame("BUTTON", name, UIParent, "OptionsListButtonTemplate");
|
||||
local button = CreateFrame("Button", name, UIParent, "OptionsListButtonTemplate");
|
||||
button:SetHeight(20);
|
||||
button:SetWidth(1000);
|
||||
button:SetDisabledFontObject("GameFontNormal");
|
||||
|
||||
@@ -160,7 +160,7 @@ Constructor
|
||||
|
||||
local function Constructor()
|
||||
local name = "WeakAurasPendingInstallButton" .. AceGUI:GetNextWidgetNum(Type)
|
||||
local button = CreateFrame("BUTTON", name, UIParent)
|
||||
local button = CreateFrame("Button", name, UIParent)
|
||||
button:SetHeight(32)
|
||||
button:SetWidth(1000)
|
||||
button.data = {}
|
||||
@@ -191,7 +191,7 @@ local function Constructor()
|
||||
|
||||
button.description = {}
|
||||
|
||||
local update = CreateFrame("BUTTON", nil, button)
|
||||
local update = CreateFrame("Button", nil, button)
|
||||
button.update = update
|
||||
update.disabled = true
|
||||
update.func = function()
|
||||
|
||||
@@ -289,7 +289,7 @@ Constructor
|
||||
|
||||
local function Constructor()
|
||||
local name = "WeakAurasPendingUpdateButton" .. AceGUI:GetNextWidgetNum(Type)
|
||||
local button = CreateFrame("BUTTON", name, UIParent)
|
||||
local button = CreateFrame("Button", name, UIParent)
|
||||
button:SetHeight(32)
|
||||
button:SetWidth(1000)
|
||||
button.data = {}
|
||||
@@ -320,7 +320,7 @@ local function Constructor()
|
||||
|
||||
button.description = {}
|
||||
|
||||
local update = CreateFrame("BUTTON", nil, button)
|
||||
local update = CreateFrame("Button", nil, button)
|
||||
button.update = update
|
||||
update.disabled = true
|
||||
update.func = function()
|
||||
|
||||
@@ -137,7 +137,7 @@ local function Constructor()
|
||||
button:SetHeight(24)
|
||||
button:SetWidth(170)
|
||||
|
||||
local deleteButton = CreateFrame("BUTTON", nil, button)
|
||||
local deleteButton = CreateFrame("Button", nil, button)
|
||||
deleteButton:SetPoint("RIGHT", button, "RIGHT", -3, 0)
|
||||
deleteButton:SetSize(20, 20)
|
||||
local deleteTex = deleteButton:CreateTexture()
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
|
||||
local Type, Version = "WeakAurasTextureButton", 25
|
||||
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
|
||||
@@ -87,7 +87,7 @@ Constructor
|
||||
|
||||
local function Constructor()
|
||||
local name = "WeakAurasTextureButton"..AceGUI:GetNextWidgetNum(Type);
|
||||
local button = CreateFrame("BUTTON", name, UIParent, "OptionsListButtonTemplate");
|
||||
local button = CreateFrame("Button", name, UIParent, "OptionsListButtonTemplate");
|
||||
button:SetHeight(128);
|
||||
button:SetWidth(128);
|
||||
button:SetBackdrop({
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
|
||||
local Type, Version = "WeakAurasTwoColumnDropdown", 3
|
||||
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, OptionsPrivate = ...
|
||||
|
||||
local L = WeakAuras.L
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, OptionsPrivate = ...
|
||||
|
||||
local L = WeakAuras.L
|
||||
|
||||
@@ -58,7 +58,7 @@
|
||||
bigStep (optional) -> step size of the slider. Defaults to 0.05
|
||||
step (optional) -> like bigStep, but applies to number input as well
|
||||
]]
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, OptionsPrivate = ...
|
||||
|
||||
local WeakAuras = WeakAuras
|
||||
@@ -2001,7 +2001,7 @@ local function addUserModeOption(options, args, data, order, prefix, i)
|
||||
while i <= #values or i <= #childValues do
|
||||
if firstChild then
|
||||
values[i] = childValues[i][nameSource] or conflictBlue .. L["Entry %i"]:format(i)
|
||||
elseif childValues[i] ~= values[i] then
|
||||
elseif childValues[i][nameSource] ~= values[i] then
|
||||
values[i] = conflictBlue .. L["Entry %i"]:format(i)
|
||||
end
|
||||
i = i + 1
|
||||
@@ -2418,7 +2418,7 @@ local function mergeOptions(mergedOptions, data, options, config, prepath, paren
|
||||
-- check if nextToMerge.nameSource was merged in the same spot as mergedOption.nameSource
|
||||
local subMergedOption = mergedOption.subOptions[mergedOption.nameSource]
|
||||
local optionData = subMergedOption.references[data.id]
|
||||
if not optionData or optionData.optionIndex ~= nextToMerge.nameSource then
|
||||
if not optionData or optionData.index ~= nextToMerge.nameSource then
|
||||
-- either an option was not merged at the name source's index, or the wrong option was.
|
||||
-- in both cases, the name source is conflicted. Fallback to "Entry #" as entry names
|
||||
mergedOption.nameSource = nil
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, OptionsPrivate = ...
|
||||
|
||||
local L = WeakAuras.L;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, OptionsPrivate = ...
|
||||
|
||||
local L = WeakAuras.L
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, OptionsPrivate = ...
|
||||
|
||||
-- Lua APIs
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, OptionsPrivate = ...
|
||||
|
||||
local L = WeakAuras.L
|
||||
|
||||
@@ -44,7 +44,7 @@
|
||||
-- - setter: The setter function, called both on activating and deactivating a property change
|
||||
--- - action: The action function, called on activating a condition
|
||||
-- - type: The type
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, OptionsPrivate = ...
|
||||
|
||||
local WeakAuras = WeakAuras;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, OptionsPrivate = ...
|
||||
local L = WeakAuras.L
|
||||
local regionOptions = WeakAuras.regionOptions
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
|
||||
-- For All Indents And Purposes
|
||||
local revision = 23
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, OptionsPrivate = ...
|
||||
|
||||
local L = WeakAuras.L;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, OptionsPrivate = ...
|
||||
|
||||
local L = WeakAuras.L
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, OptionsPrivate = ...
|
||||
|
||||
local L = WeakAuras.L
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, OptionsPrivate = ...
|
||||
|
||||
local L = WeakAuras.L
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
|
||||
if not(GetLocale() == "deDE") then
|
||||
if GetLocale() ~= "deDE" then
|
||||
return
|
||||
end
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
|
||||
local L = WeakAuras.L
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
|
||||
if not(GetLocale() == "esES") then
|
||||
if GetLocale() ~= "esES" then
|
||||
return
|
||||
end
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
|
||||
if not(GetLocale() == "esMX") then
|
||||
if GetLocale() ~= "esMX" then
|
||||
return
|
||||
end
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
|
||||
if not(GetLocale() == "frFR") then
|
||||
if GetLocale() ~= "frFR" then
|
||||
return
|
||||
end
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
|
||||
if not(GetLocale() == "itIT") then
|
||||
if GetLocale() ~= "itIT" then
|
||||
return
|
||||
end
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
|
||||
if not(GetLocale() == "koKR") then
|
||||
if GetLocale() ~= "koKR" then
|
||||
return
|
||||
end
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
|
||||
if not(GetLocale() == "ptBR") then
|
||||
if GetLocale() ~= "ptBR" then
|
||||
return
|
||||
end
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
|
||||
if not(GetLocale() == "ruRU") then
|
||||
if GetLocale() ~= "ruRU" then
|
||||
return
|
||||
end
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
|
||||
if not(GetLocale() == "zhCN") then
|
||||
if GetLocale() ~= "zhCN" then
|
||||
return
|
||||
end
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
|
||||
if not(GetLocale() == "zhTW") then
|
||||
if GetLocale() ~= "zhTW" then
|
||||
return
|
||||
end
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, OptionsPrivate = ...
|
||||
|
||||
-- Lua APIs
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, OptionsPrivate = ...
|
||||
|
||||
-- Lua APIs
|
||||
@@ -21,8 +21,8 @@ local oldFocusName
|
||||
function OptionsPrivate.StartFrameChooser(data, path)
|
||||
local frame = WeakAuras.OptionsFrame();
|
||||
if not(frameChooserFrame) then
|
||||
frameChooserFrame = CreateFrame("frame");
|
||||
frameChooserBox = CreateFrame("frame", nil, frameChooserFrame);
|
||||
frameChooserFrame = CreateFrame("Frame");
|
||||
frameChooserBox = CreateFrame("Frame", nil, frameChooserFrame);
|
||||
frameChooserBox:SetFrameStrata("TOOLTIP");
|
||||
frameChooserBox:SetBackdrop({
|
||||
edgeFile = "Interface\\Tooltips\\UI-Tooltip-Border",
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, OptionsPrivate = ...
|
||||
|
||||
-- Lua APIs
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, OptionsPrivate = ...
|
||||
|
||||
-- Lua APIs
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, OptionsPrivate = ...
|
||||
|
||||
-- Lua APIs
|
||||
@@ -57,7 +57,7 @@ local function ConstructModelPicker(frame)
|
||||
group.frame:Hide();
|
||||
group:SetLayout("flow");
|
||||
|
||||
local filterInput = CreateFrame("editbox", "WeakAurasModelFilterInput", group.frame, "WA_InputBoxTemplate")
|
||||
local filterInput = CreateFrame("EditBox", "WeakAurasModelFilterInput", group.frame, "WA_InputBoxTemplate")
|
||||
filterInput:SetAutoFocus(false)
|
||||
filterInput:SetTextInsets(16, 20, 0, 0)
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, OptionsPrivate = ...
|
||||
|
||||
-- Lua APIs
|
||||
@@ -56,11 +56,11 @@ local function ConstructMover(frame)
|
||||
topAndBottom:SetClampedToScreen(true)
|
||||
topAndBottom:SetSize(25, 45)
|
||||
topAndBottom:SetPoint("LEFT", frame, "RIGHT", 1, 0)
|
||||
local top = CreateFrame("BUTTON", nil, topAndBottom)
|
||||
local top = CreateFrame("Button", nil, topAndBottom)
|
||||
top:SetSize(25, 25)
|
||||
top:SetPoint("TOP", topAndBottom)
|
||||
top:SetFrameStrata("BACKGROUND")
|
||||
local bottom = CreateFrame("BUTTON", nil, topAndBottom)
|
||||
local bottom = CreateFrame("Button", nil, topAndBottom)
|
||||
bottom:SetSize(25, 25)
|
||||
bottom:SetPoint("BOTTOM", topAndBottom)
|
||||
bottom:SetFrameStrata("BACKGROUND")
|
||||
@@ -69,11 +69,11 @@ local function ConstructMover(frame)
|
||||
leftAndRight:SetClampedToScreen(true)
|
||||
leftAndRight:SetSize(45, 25)
|
||||
leftAndRight:SetPoint("TOP", frame, "BOTTOM", 0, 1)
|
||||
local left = CreateFrame("BUTTON", nil, leftAndRight)
|
||||
local left = CreateFrame("Button", nil, leftAndRight)
|
||||
left:SetSize(25, 25)
|
||||
left:SetPoint("LEFT", leftAndRight)
|
||||
left:SetFrameStrata("BACKGROUND")
|
||||
local right = CreateFrame("BUTTON", nil, leftAndRight)
|
||||
local right = CreateFrame("Button", nil, leftAndRight)
|
||||
right:SetSize(25, 25)
|
||||
right:SetPoint("RIGHT", leftAndRight)
|
||||
right:SetFrameStrata("BACKGROUND")
|
||||
@@ -107,7 +107,7 @@ local function ConstructMover(frame)
|
||||
right:GetPushedTexture():SetRotation(-math.pi/2)
|
||||
right:SetScript("OnClick", function() moveOnePxl("right") end)
|
||||
|
||||
local arrow = CreateFrame("frame", nil, frame)
|
||||
local arrow = CreateFrame("Frame", nil, frame)
|
||||
arrow:SetClampedToScreen(true)
|
||||
arrow:SetSize(196, 196)
|
||||
arrow:SetPoint("CENTER", frame, "CENTER")
|
||||
@@ -146,7 +146,7 @@ end
|
||||
local function ConstructSizer(frame)
|
||||
-- topright, bottomright, bottomleft, topleft
|
||||
|
||||
local topright = CreateFrame("FRAME", nil, frame)
|
||||
local topright = CreateFrame("Frame", nil, frame)
|
||||
topright:EnableMouse()
|
||||
topright:SetWidth(16)
|
||||
topright:SetHeight(16)
|
||||
@@ -178,7 +178,7 @@ local function ConstructSizer(frame)
|
||||
texTR2:Hide()
|
||||
end
|
||||
|
||||
local bottomright = CreateFrame("FRAME", nil, frame)
|
||||
local bottomright = CreateFrame("Frame", nil, frame)
|
||||
bottomright:EnableMouse()
|
||||
bottomright:SetWidth(16)
|
||||
bottomright:SetHeight(16)
|
||||
@@ -210,7 +210,7 @@ local function ConstructSizer(frame)
|
||||
texBR2:Hide()
|
||||
end
|
||||
|
||||
local bottomleft = CreateFrame("FRAME", nil, frame)
|
||||
local bottomleft = CreateFrame("Frame", nil, frame)
|
||||
bottomleft:EnableMouse()
|
||||
bottomleft:SetSize(16, 16)
|
||||
bottomleft:SetHeight(16)
|
||||
@@ -242,7 +242,7 @@ local function ConstructSizer(frame)
|
||||
texBL2:Hide()
|
||||
end
|
||||
|
||||
local topleft = CreateFrame("FRAME", nil, frame)
|
||||
local topleft = CreateFrame("Frame", nil, frame)
|
||||
topleft:EnableMouse()
|
||||
topleft:SetWidth(16)
|
||||
topleft:SetHeight(16)
|
||||
@@ -276,7 +276,7 @@ local function ConstructSizer(frame)
|
||||
|
||||
-- top, right, bottom, left
|
||||
|
||||
local top = CreateFrame("FRAME", nil, frame)
|
||||
local top = CreateFrame("Frame", nil, frame)
|
||||
top:EnableMouse()
|
||||
top:SetHeight(8)
|
||||
top:SetPoint("TOPRIGHT", topright, "TOPLEFT")
|
||||
@@ -298,7 +298,7 @@ local function ConstructSizer(frame)
|
||||
texT:Hide()
|
||||
end
|
||||
|
||||
local right = CreateFrame("FRAME", nil, frame)
|
||||
local right = CreateFrame("Frame", nil, frame)
|
||||
right:EnableMouse()
|
||||
right:SetWidth(8)
|
||||
right:SetPoint("BOTTOMRIGHT", bottomright, "TOPRIGHT")
|
||||
@@ -320,7 +320,7 @@ local function ConstructSizer(frame)
|
||||
texR:Hide()
|
||||
end
|
||||
|
||||
local bottom = CreateFrame("FRAME", nil, frame)
|
||||
local bottom = CreateFrame("Frame", nil, frame)
|
||||
bottom:EnableMouse()
|
||||
bottom:SetHeight(8)
|
||||
bottom:SetPoint("BOTTOMLEFT", bottomleft, "BOTTOMRIGHT")
|
||||
@@ -343,7 +343,7 @@ local function ConstructSizer(frame)
|
||||
texB:Hide()
|
||||
end
|
||||
|
||||
local left = CreateFrame("FRAME", nil, frame)
|
||||
local left = CreateFrame("Frame", nil, frame)
|
||||
left:EnableMouse()
|
||||
left:SetWidth(8)
|
||||
left:SetPoint("TOPLEFT", topleft, "BOTTOMLEFT")
|
||||
@@ -417,7 +417,7 @@ local function BuildAlignLines(mover)
|
||||
end
|
||||
|
||||
local function ConstructMoverSizer(parent)
|
||||
local frame = CreateFrame("FRAME", nil, parent)
|
||||
local frame = CreateFrame("Frame", nil, parent)
|
||||
frame:SetBackdrop({
|
||||
edgeFile = "Interface\\Tooltips\\UI-Tooltip-Border",
|
||||
edgeSize = 12,
|
||||
@@ -439,7 +439,7 @@ local function ConstructMoverSizer(parent)
|
||||
frame.left.Clear()
|
||||
frame.topleft.Clear()
|
||||
|
||||
local mover = CreateFrame("FRAME", nil, frame)
|
||||
local mover = CreateFrame("Frame", nil, frame)
|
||||
mover:RegisterEvent("PLAYER_REGEN_DISABLED")
|
||||
mover:EnableMouse()
|
||||
mover.moving = {}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, OptionsPrivate = ...
|
||||
|
||||
-- Lua APIs
|
||||
@@ -44,7 +44,7 @@ local function CreateFrameSizer(frame, callback, position)
|
||||
xOffset2, yOffset2 = -1, -1
|
||||
end
|
||||
|
||||
local handle = CreateFrame("BUTTON", nil, frame)
|
||||
local handle = CreateFrame("Button", nil, frame)
|
||||
handle:SetPoint(position, frame)
|
||||
handle:SetSize(25, 25)
|
||||
handle:EnableMouse()
|
||||
@@ -88,7 +88,7 @@ local minWidth = 750
|
||||
local minHeight = 240
|
||||
|
||||
function OptionsPrivate.CreateFrame()
|
||||
CreateFrame("frame", "WeakAuras_DropDownMenu", nil, "UIDropDownMenuTemplate")
|
||||
CreateFrame("Frame", "WeakAuras_DropDownMenu", nil, "UIDropDownMenuTemplate")
|
||||
local frame
|
||||
local db = OptionsPrivate.savedVars.db
|
||||
local odb = OptionsPrivate.savedVars.odb
|
||||
@@ -367,7 +367,7 @@ function OptionsPrivate.CreateFrame()
|
||||
tipPopupLabel:SetJustifyH("LEFT")
|
||||
tipPopupLabel:SetJustifyV("TOP")
|
||||
|
||||
local urlWidget = CreateFrame("EDITBOX", nil, tipPopup, "WA_InputBoxTemplate")
|
||||
local urlWidget = CreateFrame("EditBox", nil, tipPopup, "WA_InputBoxTemplate")
|
||||
urlWidget:SetFont(STANDARD_TEXT_FONT, 12)
|
||||
urlWidget:SetPoint("TOPLEFT", tipPopupLabel, "BOTTOMLEFT", 6, 0)
|
||||
urlWidget:SetPoint("TOPRIGHT", tipPopupLabel, "BOTTOMRIGHT", 0, 0)
|
||||
@@ -490,7 +490,7 @@ function OptionsPrivate.CreateFrame()
|
||||
frame.moversizer, frame.mover = OptionsPrivate.MoverSizer(frame)
|
||||
|
||||
-- filter line
|
||||
local filterInput = CreateFrame("editbox", "WeakAurasFilterInput", frame, "WA_InputBoxTemplate")
|
||||
local filterInput = CreateFrame("EditBox", "WeakAurasFilterInput", frame, "WA_InputBoxTemplate")
|
||||
filterInput:SetAutoFocus(false)
|
||||
filterInput:SetTextInsets(16, 20, 0, 0)
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, OptionsPrivate = ...
|
||||
|
||||
-- Lua APIs
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, OptionsPrivate = ...
|
||||
|
||||
-- Lua APIs
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, OptionsPrivate = ...
|
||||
|
||||
local AceGUI = LibStub("AceGUI-3.0")
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, OptionsPrivate = ...
|
||||
|
||||
local SharedMedia = LibStub("LibSharedMedia-3.0");
|
||||
@@ -457,7 +457,7 @@ end
|
||||
-- Create preview thumbnail
|
||||
local function createThumbnail()
|
||||
-- Preview frame
|
||||
local borderframe = CreateFrame("FRAME", nil, UIParent);
|
||||
local borderframe = CreateFrame("Frame", nil, UIParent);
|
||||
borderframe:SetWidth(32);
|
||||
borderframe:SetHeight(32);
|
||||
|
||||
@@ -468,13 +468,13 @@ local function createThumbnail()
|
||||
border:SetTexCoord(0.2, 0.8, 0.2, 0.8);
|
||||
|
||||
-- Main region
|
||||
local region = CreateFrame("FRAME", nil, borderframe);
|
||||
local region = CreateFrame("Frame", nil, borderframe);
|
||||
borderframe.region = region;
|
||||
region:SetWidth(32);
|
||||
region:SetHeight(32);
|
||||
|
||||
-- Status-bar frame
|
||||
local bar = CreateFrame("FRAME", nil, region);
|
||||
local bar = CreateFrame("Frame", nil, region);
|
||||
borderframe.bar = bar;
|
||||
|
||||
-- Fake status-bar
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, OptionsPrivate = ...
|
||||
|
||||
local L = WeakAuras.L
|
||||
@@ -463,7 +463,7 @@ end
|
||||
|
||||
local function createThumbnail()
|
||||
-- frame
|
||||
local thumbnail = CreateFrame("FRAME", nil, UIParent);
|
||||
local thumbnail = CreateFrame("Frame", nil, UIParent);
|
||||
thumbnail:SetWidth(32);
|
||||
thumbnail:SetHeight(32);
|
||||
|
||||
@@ -494,7 +494,7 @@ local function defaultIconAnimation(self, elapsed)
|
||||
end
|
||||
|
||||
local function createAnimatedDefaultIcon(parent)
|
||||
local defaultIcon = CreateFrame("FRAME", nil, parent);
|
||||
local defaultIcon = CreateFrame("Frame", nil, parent);
|
||||
parent.defaultIcon = defaultIcon;
|
||||
|
||||
local t1 = defaultIcon:CreateTexture(nil, "ARTWORK");
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
if not WeakAuras.IsCorrectVersion() then return end
|
||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||
local AddonName, OptionsPrivate = ...
|
||||
|
||||
local L = WeakAuras.L;
|
||||
@@ -629,7 +629,7 @@ end
|
||||
|
||||
local function createThumbnail()
|
||||
-- frame
|
||||
local thumbnail = CreateFrame("FRAME", nil, UIParent);
|
||||
local thumbnail = CreateFrame("Frame", nil, UIParent);
|
||||
thumbnail:SetWidth(32);
|
||||
thumbnail:SetHeight(32);
|
||||
|
||||
@@ -648,7 +648,7 @@ end
|
||||
|
||||
local function createDefaultIcon(parent)
|
||||
-- default Icon
|
||||
local defaultIcon = CreateFrame("FRAME", nil, parent);
|
||||
local defaultIcon = CreateFrame("Frame", nil, parent);
|
||||
parent.defaultIcon = defaultIcon;
|
||||
|
||||
local t1 = defaultIcon:CreateTexture(nil, "ARTWORK");
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user