# HG changeset patch
# User Tercio
# Date 1532124788 10800
# Node ID 9ad7f3c634f1a6294ee602d05d9fe2e9b7369d51
# Parent 817b319cd8ce13a198d5ec516ea5d1646c8e9e8f
- Updated Libraries.
diff -r 817b319cd8ce -r 9ad7f3c634f1 Libs/AceAddon-3.0/AceAddon-3.0.xml
--- a/Libs/AceAddon-3.0/AceAddon-3.0.xml Fri Jul 20 19:12:19 2018 -0300
+++ b/Libs/AceAddon-3.0/AceAddon-3.0.xml Fri Jul 20 19:13:08 2018 -0300
@@ -1,4 +1,4 @@
-
\ No newline at end of file
+
diff -r 817b319cd8ce -r 9ad7f3c634f1 Libs/AceConfig-3.0/AceConfig-3.0.xml
--- a/Libs/AceConfig-3.0/AceConfig-3.0.xml Fri Jul 20 19:12:19 2018 -0300
+++ b/Libs/AceConfig-3.0/AceConfig-3.0.xml Fri Jul 20 19:13:08 2018 -0300
@@ -5,4 +5,4 @@
-
\ No newline at end of file
+
diff -r 817b319cd8ce -r 9ad7f3c634f1 Libs/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.xml
--- a/Libs/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.xml Fri Jul 20 19:12:19 2018 -0300
+++ b/Libs/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.xml Fri Jul 20 19:13:08 2018 -0300
@@ -1,4 +1,4 @@
-
\ No newline at end of file
+
diff -r 817b319cd8ce -r 9ad7f3c634f1 Libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua
--- a/Libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua Fri Jul 20 19:12:19 2018 -0300
+++ b/Libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua Fri Jul 20 19:13:08 2018 -0300
@@ -1,13 +1,13 @@
--- AceConfigDialog-3.0 generates AceGUI-3.0 based windows based on option tables.
-- @class file
-- @name AceConfigDialog-3.0
--- @release $Id: AceConfigDialog-3.0.lua 1167 2017-08-29 22:08:48Z funkydude $
+-- @release $Id: AceConfigDialog-3.0.lua 1169 2018-02-27 16:18:28Z nevcairiel $
local LibStub = LibStub
local gui = LibStub("AceGUI-3.0")
local reg = LibStub("AceConfigRegistry-3.0")
-local MAJOR, MINOR = "AceConfigDialog-3.0", 64
+local MAJOR, MINOR = "AceConfigDialog-3.0", 66
local AceConfigDialog, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
if not AceConfigDialog then return end
@@ -1034,6 +1034,7 @@
entry.value = k
entry.text = GetOptionsMemberValue("name", v, options, path, appName)
entry.icon = GetOptionsMemberValue("icon", v, options, path, appName)
+ entry.iconCoords = GetOptionsMemberValue("iconCoords", v, options, path, appName)
entry.disabled = CheckOptionDisabled(v, options, path, appName)
tinsert(tree,entry)
if recurse and (v.childGroups or "tree") == "tree" then
@@ -1226,6 +1227,8 @@
radio:SetWidth(width_multiplier * 2)
elseif width == "half" then
radio:SetWidth(width_multiplier / 2)
+ elseif (type(width) == "number") then
+ radio:SetWidth(width_multiplier * width)
elseif width == "full" then
radio.width = "fill"
else
@@ -1288,6 +1291,8 @@
control:SetWidth(width_multiplier * 2)
elseif width == "half" then
control:SetWidth(width_multiplier / 2)
+ elseif (type(width) == "number") then
+ control:SetWidth(width_multiplier * width)
elseif width == "full" then
control.width = "fill"
else
@@ -1324,6 +1329,8 @@
check:SetWidth(width_multiplier * 2)
elseif width == "half" then
check:SetWidth(width_multiplier / 2)
+ elseif (type(width) == "number") then
+ control:SetWidth(width_multiplier * width)
elseif width == "full" then
check.width = "fill"
else
@@ -1405,6 +1412,8 @@
control:SetWidth(width_multiplier * 2)
elseif width == "half" then
control:SetWidth(width_multiplier / 2)
+ elseif (type(width) == "number") then
+ control:SetWidth(width_multiplier * width)
elseif width == "full" then
control.width = "fill"
else
diff -r 817b319cd8ce -r 9ad7f3c634f1 Libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.xml
--- a/Libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.xml Fri Jul 20 19:12:19 2018 -0300
+++ b/Libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.xml Fri Jul 20 19:13:08 2018 -0300
@@ -1,4 +1,4 @@
-
\ No newline at end of file
+
diff -r 817b319cd8ce -r 9ad7f3c634f1 Libs/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.lua
--- a/Libs/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.lua Fri Jul 20 19:12:19 2018 -0300
+++ b/Libs/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.lua Fri Jul 20 19:13:08 2018 -0300
@@ -8,10 +8,10 @@
-- :IterateOptionsTables() (and :GetOptionsTable() if only given one argument) return a function reference that the requesting config handling addon must call with valid "uiType", "uiName".
-- @class file
-- @name AceConfigRegistry-3.0
--- @release $Id: AceConfigRegistry-3.0.lua 1161 2017-08-12 14:30:16Z funkydude $
+-- @release $Id: AceConfigRegistry-3.0.lua 1169 2018-02-27 16:18:28Z nevcairiel $
local CallbackHandler = LibStub("CallbackHandler-1.0")
-local MAJOR, MINOR = "AceConfigRegistry-3.0", 17
+local MAJOR, MINOR = "AceConfigRegistry-3.0", 18
local AceConfigRegistry = LibStub:NewLibrary(MAJOR, MINOR)
if not AceConfigRegistry then return end
@@ -67,6 +67,7 @@
local opttable={["nil"]=true,["table"]=true, _="table"}
local optbool={["nil"]=true,["boolean"]=true, _="boolean"}
local optboolnumber={["nil"]=true,["boolean"]=true,["number"]=true, _="boolean or number"}
+local optstringnumber={["nil"]=true,["string"]=true,["number"]=true, _="string or number"}
local basekeys={
type=isstring,
@@ -90,7 +91,7 @@
set=optmethodfalse,
func=optmethodfalse,
arg={["*"]=true},
- width=optstring,
+ width=optstringnumber,
}
local typedkeys={
diff -r 817b319cd8ce -r 9ad7f3c634f1 Libs/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.xml
--- a/Libs/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.xml Fri Jul 20 19:12:19 2018 -0300
+++ b/Libs/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.xml Fri Jul 20 19:13:08 2018 -0300
@@ -1,4 +1,4 @@
-
\ No newline at end of file
+
diff -r 817b319cd8ce -r 9ad7f3c634f1 Libs/AceConsole-3.0/AceConsole-3.0.xml
--- a/Libs/AceConsole-3.0/AceConsole-3.0.xml Fri Jul 20 19:12:19 2018 -0300
+++ b/Libs/AceConsole-3.0/AceConsole-3.0.xml Fri Jul 20 19:13:08 2018 -0300
@@ -1,4 +1,4 @@
-
\ No newline at end of file
+
diff -r 817b319cd8ce -r 9ad7f3c634f1 Libs/AceDB-3.0/AceDB-3.0.xml
--- a/Libs/AceDB-3.0/AceDB-3.0.xml Fri Jul 20 19:12:19 2018 -0300
+++ b/Libs/AceDB-3.0/AceDB-3.0.xml Fri Jul 20 19:13:08 2018 -0300
@@ -1,4 +1,4 @@
-
\ No newline at end of file
+
diff -r 817b319cd8ce -r 9ad7f3c634f1 Libs/AceDBOptions-3.0/AceDBOptions-3.0.xml
--- a/Libs/AceDBOptions-3.0/AceDBOptions-3.0.xml Fri Jul 20 19:12:19 2018 -0300
+++ b/Libs/AceDBOptions-3.0/AceDBOptions-3.0.xml Fri Jul 20 19:13:08 2018 -0300
@@ -1,4 +1,4 @@
-
\ No newline at end of file
+
diff -r 817b319cd8ce -r 9ad7f3c634f1 Libs/AceEvent-3.0/AceEvent-3.0.xml
--- a/Libs/AceEvent-3.0/AceEvent-3.0.xml Fri Jul 20 19:12:19 2018 -0300
+++ b/Libs/AceEvent-3.0/AceEvent-3.0.xml Fri Jul 20 19:13:08 2018 -0300
@@ -1,4 +1,4 @@
-
\ No newline at end of file
+
diff -r 817b319cd8ce -r 9ad7f3c634f1 Libs/AceTimer-3.0/AceTimer-3.0.lua
--- a/Libs/AceTimer-3.0/AceTimer-3.0.lua Fri Jul 20 19:12:19 2018 -0300
+++ b/Libs/AceTimer-3.0/AceTimer-3.0.lua Fri Jul 20 19:13:08 2018 -0300
@@ -15,7 +15,7 @@
-- make into AceTimer.
-- @class file
-- @name AceTimer-3.0
--- @release $Id: AceTimer-3.0.lua 1119 2014-10-14 17:23:29Z nevcairiel $
+-- @release $Id: AceTimer-3.0.lua 1170 2018-03-29 17:38:58Z funkydude $
local MAJOR, MINOR = "AceTimer-3.0", 17 -- Bump minor on changes
local AceTimer, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
@@ -34,13 +34,15 @@
delay = 0.01 -- Restrict to the lowest time that the C_Timer API allows us
end
- local timer = {...}
- timer.object = self
- timer.func = func
- timer.looping = loop
- timer.argsCount = select("#", ...)
- timer.delay = delay
- timer.ends = GetTime() + delay
+ local timer = {
+ object = self,
+ func = func,
+ looping = loop,
+ argsCount = select("#", ...),
+ delay = delay,
+ ends = GetTime() + delay,
+ ...
+ }
activeTimers[timer] = timer
@@ -156,7 +158,7 @@
--- Cancels all timers registered to the current addon object ('self')
function AceTimer:CancelAllTimers()
- for k,v in pairs(activeTimers) do
+ for k,v in next, activeTimers do
if v.object == self then
AceTimer.CancelTimer(self, k)
end
@@ -187,8 +189,8 @@
AceTimer.frame:SetScript("OnEvent", nil)
AceTimer.frame:UnregisterAllEvents()
-- convert timers
- for object,timers in pairs(AceTimer.selfs) do
- for handle,timer in pairs(timers) do
+ for object,timers in next, AceTimer.selfs do
+ for handle,timer in next, timers do
if type(timer) == "table" and timer.callback then
local newTimer
if timer.delay then
@@ -214,7 +216,7 @@
-- Clear old timer table and update upvalue
AceTimer.activeTimers = {}
activeTimers = AceTimer.activeTimers
- for handle, timer in pairs(oldTimers) do
+ for handle, timer in next, oldTimers do
local newTimer
-- Stop the old timer animation
local duration, elapsed = timer:GetDuration(), timer:GetElapsed()
@@ -232,7 +234,7 @@
-- Migrate transitional handles
if oldminor < 13 and AceTimer.hashCompatTable then
- for handle, id in pairs(AceTimer.hashCompatTable) do
+ for handle, id in next, AceTimer.hashCompatTable do
local t = activeTimers[id]
if t then
activeTimers[id] = nil
@@ -257,7 +259,7 @@
function AceTimer:Embed(target)
AceTimer.embeds[target] = true
- for _,v in pairs(mixins) do
+ for _,v in next, mixins do
target[v] = AceTimer[v]
end
return target
@@ -271,6 +273,6 @@
target:CancelAllTimers()
end
-for addon in pairs(AceTimer.embeds) do
+for addon in next, AceTimer.embeds do
AceTimer:Embed(addon)
end
diff -r 817b319cd8ce -r 9ad7f3c634f1 Libs/AceTimer-3.0/AceTimer-3.0.xml
--- a/Libs/AceTimer-3.0/AceTimer-3.0.xml Fri Jul 20 19:12:19 2018 -0300
+++ b/Libs/AceTimer-3.0/AceTimer-3.0.xml Fri Jul 20 19:13:08 2018 -0300
@@ -1,4 +1,4 @@
-
\ No newline at end of file
+
diff -r 817b319cd8ce -r 9ad7f3c634f1 Libs/CallbackHandler-1.0/CallbackHandler-1.0.xml
--- a/Libs/CallbackHandler-1.0/CallbackHandler-1.0.xml Fri Jul 20 19:12:19 2018 -0300
+++ b/Libs/CallbackHandler-1.0/CallbackHandler-1.0.xml Fri Jul 20 19:13:08 2018 -0300
@@ -1,4 +1,4 @@
-
\ No newline at end of file
+
diff -r 817b319cd8ce -r 9ad7f3c634f1 Libs/LibDBIcon-1.0/LibDBIcon-1.0.lua
--- a/Libs/LibDBIcon-1.0/LibDBIcon-1.0.lua Fri Jul 20 19:12:19 2018 -0300
+++ b/Libs/LibDBIcon-1.0/LibDBIcon-1.0.lua Fri Jul 20 19:13:08 2018 -0300
@@ -1,39 +1,12 @@
---[[
-Name: DBIcon-1.0
-Revision: $Rev: 56 $
-Author(s): Rabbit (rabbit.magtheridon@gmail.com)
-Description: Allows addons to register to recieve a lightweight minimap icon as an alternative to more heavy LDB displays.
-Dependencies: LibStub
-License: GPL v2 or later.
-]]
-
---[[
-Copyright (C) 2008-2011 Rabbit
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-]]
-----------------------------------------------------------------------
--- DBIcon-1.0
+-- LibDBIcon-1.0
--
--- Disclaimer: Most of this code was ripped from Barrel but fixed, streamlined
--- and cleaned up a lot so that it no longer sucks.
+-- Allows addons to easily create a lightweight minimap icon as an alternative to heavier LDB displays.
--
local DBICON10 = "LibDBIcon-1.0"
-local DBICON10_MINOR = tonumber(("$Rev: 56 $"):match("(%d+)"))
+local DBICON10_MINOR = 36 -- Bump on changes
if not LibStub then error(DBICON10 .. " requires LibStub.") end
local ldb = LibStub("LibDataBroker-1.1", true)
if not ldb then error(DBICON10 .. " requires LibDataBroker-1.1.") end
@@ -45,8 +18,9 @@
lib.callbackRegistered = lib.callbackRegistered or nil
lib.callbacks = lib.callbacks or LibStub("CallbackHandler-1.0"):New(lib)
lib.notCreated = lib.notCreated or {}
+lib.tooltip = lib.tooltip or CreateFrame("GameTooltip", "LibDBIconTooltip", UIParent, "GameTooltipTemplate")
-function lib:IconCallback(event, name, key, value, dataobj)
+function lib:IconCallback(event, name, key, value)
if lib.objects[name] then
if key == "icon" then
lib.objects[name].icon:SetTexture(value)
@@ -73,7 +47,6 @@
lib.callbackRegistered = true
end
--- Tooltip code ripped from StatBlockCore by Funkydude
local function getAnchors(frame)
local x, y = frame:GetCenter()
if not x or not y then return "CENTER" end
@@ -86,10 +59,10 @@
if self.isMoving then return end
local obj = self.dataObject
if obj.OnTooltipShow then
- GameTooltip:SetOwner(self, "ANCHOR_NONE")
- GameTooltip:SetPoint(getAnchors(self))
- obj.OnTooltipShow(GameTooltip)
- GameTooltip:Show()
+ lib.tooltip:SetOwner(self, "ANCHOR_NONE")
+ lib.tooltip:SetPoint(getAnchors(self))
+ obj.OnTooltipShow(lib.tooltip)
+ lib.tooltip:Show()
elseif obj.OnEnter then
obj.OnEnter(self)
end
@@ -97,13 +70,13 @@
local function onLeave(self)
local obj = self.dataObject
- GameTooltip:Hide()
+ lib.tooltip:Hide()
if obj.OnLeave then obj.OnLeave(self) end
end
--------------------------------------------------------------------------------
-local onClick, onMouseUp, onMouseDown, onDragStart, onDragStop, onDragEnd, updatePosition
+local onClick, onMouseUp, onMouseDown, onDragStart, onDragStop, updatePosition
do
local minimapShapes = {
@@ -165,7 +138,7 @@
self.icon:UpdateCoord()
self:SetScript("OnUpdate", onUpdate)
self.isMoving = true
- GameTooltip:Hide()
+ lib.tooltip:Hide()
end
end
@@ -197,14 +170,14 @@
button:SetFrameLevel(8)
button:RegisterForClicks("anyUp")
button:RegisterForDrag("LeftButton")
- button:SetHighlightTexture("Interface\\Minimap\\UI-Minimap-ZoomButton-Highlight")
+ button:SetHighlightTexture(136477) --"Interface\\Minimap\\UI-Minimap-ZoomButton-Highlight"
local overlay = button:CreateTexture(nil, "OVERLAY")
overlay:SetSize(53, 53)
- overlay:SetTexture("Interface\\Minimap\\MiniMap-TrackingBorder")
+ overlay:SetTexture(136430) --"Interface\\Minimap\\MiniMap-TrackingBorder"
overlay:SetPoint("TOPLEFT")
local background = button:CreateTexture(nil, "BACKGROUND")
background:SetSize(20, 20)
- background:SetTexture("Interface\\Minimap\\UI-Minimap-Background")
+ background:SetTexture(136467) --"Interface\\Minimap\\UI-Minimap-Background"
background:SetPoint("TOPLEFT", 7, -5)
local icon = button:CreateTexture(nil, "ARTWORK")
icon:SetSize(17, 17)
diff -r 817b319cd8ce -r 9ad7f3c634f1 Libs/LibDataBroker-1.1/LibDataBroker-1.1.lua
--- a/Libs/LibDataBroker-1.1/LibDataBroker-1.1.lua Fri Jul 20 19:12:19 2018 -0300
+++ b/Libs/LibDataBroker-1.1/LibDataBroker-1.1.lua Fri Jul 20 19:13:08 2018 -0300
@@ -2,7 +2,7 @@
assert(LibStub, "LibDataBroker-1.1 requires LibStub")
assert(LibStub:GetLibrary("CallbackHandler-1.0", true), "LibDataBroker-1.1 requires CallbackHandler-1.0")
-local lib, oldminor = LibStub:NewLibrary("LibDataBroker-1.1", 3)
+local lib, oldminor = LibStub:NewLibrary("LibDataBroker-1.1", 4)
if not lib then return end
oldminor = oldminor or 0
@@ -64,3 +64,27 @@
return self.namestorage[dataobject]
end
end
+
+if oldminor < 4 then
+ local next = pairs(attributestorage)
+ function lib:pairs(dataobject_or_name)
+ local t = type(dataobject_or_name)
+ assert(t == "string" or t == "table", "Usage: ldb:pairs('dataobjectname') or ldb:pairs(dataobject)")
+
+ local dataobj = self.proxystorage[dataobject_or_name] or dataobject_or_name
+ assert(attributestorage[dataobj], "Data object not found")
+
+ return next, attributestorage[dataobj], nil
+ end
+
+ local ipairs_iter = ipairs(attributestorage)
+ function lib:ipairs(dataobject_or_name)
+ local t = type(dataobject_or_name)
+ assert(t == "string" or t == "table", "Usage: ldb:ipairs('dataobjectname') or ldb:ipairs(dataobject)")
+
+ local dataobj = self.proxystorage[dataobject_or_name] or dataobject_or_name
+ assert(attributestorage[dataobj], "Data object not found")
+
+ return ipairs_iter, attributestorage[dataobj], 0
+ end
+end
diff -r 817b319cd8ce -r 9ad7f3c634f1 Libs/LibSharedMedia-3.0/lib.xml
--- a/Libs/LibSharedMedia-3.0/lib.xml Fri Jul 20 19:12:19 2018 -0300
+++ b/Libs/LibSharedMedia-3.0/lib.xml Fri Jul 20 19:13:08 2018 -0300
@@ -1,4 +1,4 @@
-
\ No newline at end of file
+