replace Ace3v with Ace3 ElvUI-TBC version

or easy tracking of code difference
2026-07-27 08:24:44 +00:00 · 2018-07-21 13:20:39 +03:00
parent bb867629d5
commit 332d53e7f6
59 changed files with 1975 additions and 2496 deletions
@@ -40,22 +40,18 @@
 -- end
 -- @class file
 -- @name AceDB-3.0.lua
-- @release $Id: AceDB-3.0.lua 1142 2016-07-11 08:36:19Z nevcairiel $
+-- @release $Id: AceDB-3.0.lua 1124 2014-10-27 21:00:07Z funkydude $
 local ACEDB_MAJOR, ACEDB_MINOR = "AceDB-3.0", 26
 local AceDB, oldminor = LibStub:NewLibrary(ACEDB_MAJOR, ACEDB_MINOR)

 if not AceDB then return end -- No upgrade needed

-local AceCore = LibStub("AceCore-3.0")
-local new, del = AceCore.new, AceCore.del
-
 -- Lua APIs
 local type, pairs, next, error = type, pairs, next, error
 local setmetatable, getmetatable, rawset, rawget = setmetatable, getmetatable, rawset, rawget
-local format, lower = string.format, string.lower

 -- WoW APIs
-local _G = AceCore._G
+local _G = _G

 -- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
 -- List them here for Mikk's FindGlobals script
@@ -69,13 +65,6 @@ local CallbackDummy = { Fire = function() end }

 local DBObjectLib = {}

-- Ace3v: for all recursive functions we must declare the iterator as local again, this step is necessary in vanilla
-- Example:
--   for k,v in pairs(table) do
--       local v = v
--       ...
-
-
 --[[-------------------------------------------------------------------------
 	AceDB Utility Functions
 ---------------------------------------------------------------------------]]
@@ -85,7 +74,6 @@ local function copyTable(src, dest)
 	if type(dest) ~= "table" then dest = {} end
 	if type(src) == "table" then
 		for k,v in pairs(src) do
-			local v = v
 			if type(v) == "table" then
 				-- try to index the key first so that the metatable creates the defaults, if set, and use that table
 				v = copyTable(v, dest[k])
@@ -105,7 +93,6 @@ local function copyDefaults(dest, src)
 	-- this happens if some value in the SV overwrites our default value with a non-table
 	--if type(dest) ~= "table" then return end
 	for k, v in pairs(src) do
-		local v = v
 		if k == "*" or k == "**" then
 			if type(v) == "table" then
 				-- This is a metatable used for table defaults
@@ -153,12 +140,10 @@ local function removeDefaults(db, defaults, blocker)
 	setmetatable(db, nil)
 	-- loop through the defaults and remove their content
 	for k,v in pairs(defaults) do
-		local v = v
 		if k == "*" or k == "**" then
 			if type(v) == "table" then
 				-- Loop through all the actual k,v pairs and remove
 				for key, value in pairs(db) do
-					local value = value
 					if type(value) == "table" then
 						-- if the key was not explicitly specified in the defaults table, just strip everything from * and ** tables
 						if defaults[key] == nil and (not blocker or blocker[key] == nil) then
@@ -220,35 +205,36 @@ end
 -- Metatable to handle the dynamic creation of sections and copying of sections.
 local dbmt = {
 	__index = function(t, section)
-		local keys = rawget(t, "keys")
-		local key = keys[section]
-		if key then
-			local defaultTbl = rawget(t, "defaults")
-			local defaults = defaultTbl and defaultTbl[section]
+			local keys = rawget(t, "keys")
+			local key = keys[section]
+			if key then
+				local defaultTbl = rawget(t, "defaults")
+				local defaults = defaultTbl and defaultTbl[section]

-			if section == "profile" then
-				if initSection(t, section, "profiles", key, defaults) then
-					-- Callback: OnNewProfile, database, newProfileKey
-					t.callbacks:Fire("OnNewProfile", 2, t, key)
+				if section == "profile" then
+					local new = initSection(t, section, "profiles", key, defaults)
+					if new then
+						-- Callback: OnNewProfile, database, newProfileKey
+						t.callbacks:Fire("OnNewProfile", t, key)
+					end
+				elseif section == "profiles" then
+					local sv = rawget(t, "sv")
+					if not sv.profiles then sv.profiles = {} end
+					rawset(t, "profiles", sv.profiles)
+				elseif section == "global" then
+					local sv = rawget(t, "sv")
+					if not sv.global then sv.global = {} end
+					if defaults then
+						copyDefaults(sv.global, defaults)
+					end
+					rawset(t, section, sv.global)
+				else
+					initSection(t, section, section, key, defaults)
 				end
-			elseif section == "profiles" then
-				local sv = rawget(t, "sv")
-				if not sv.profiles then sv.profiles = {} end
-				rawset(t, "profiles", sv.profiles)
-			elseif section == "global" then
-				local sv = rawget(t, "sv")
-				if not sv.global then sv.global = {} end
-				if defaults then
-					copyDefaults(sv.global, defaults)
-				end
-				rawset(t, section, sv.global)
-			else
-				initSection(t, section, section, key, defaults)
 			end
-		end

-		return rawget(t, section)
-	end
+			return rawget(t, section)
+		end
 }

 local function validateDefaults(defaults, keyTbl, offset)
@@ -256,7 +242,7 @@ local function validateDefaults(defaults, keyTbl, offset)
 	offset = offset or 0
 	for k in pairs(defaults) do
 		if not keyTbl[k] or k == "profiles" then
-			error(format("Usage: AceDBObject:RegisterDefaults(defaults): '%s' is not a valid datatype.", k), 3 + offset)
+			error(("Usage: AceDBObject:RegisterDefaults(defaults): '%s' is not a valid datatype."):format(k), 3 + offset)
 		end
 	end
 end
@@ -273,10 +259,10 @@ local realmKey = GetRealmName()
 local charKey = UnitName("player") .. " - " .. realmKey
 local _, classKey = UnitClass("player")
 local _, raceKey = UnitRace("player")
-local _, factionKey = UnitFactionGroup("player")
-- Ace3v: the faction key may error when in GM mode
-factionKey = factionKey or "Others"
-local localeKey = lower(GetLocale())
+local factionKey = UnitFactionGroup("player")
+local factionrealmKey = factionKey .. " - " .. realmKey
+local factionrealmregionKey = factionrealmKey .. " - " .. string.sub(GetCVar("realmList"), 1, 2):upper()
+local localeKey = GetLocale():lower()

 -- Actual database initialization function
 local function initdb(sv, defaults, defaultProfile, olddb, parent)
@@ -312,7 +298,8 @@ local function initdb(sv, defaults, defaultProfile, olddb, parent)
 		["class"] = classKey,
 		["race"] = raceKey,
 		["faction"] = factionKey,
-		["factionrealm"] = factionKey .. " - " .. realmKey,
+		["factionrealm"] = factionrealmKey,
+		["factionrealmregion"] = factionrealmregionKey,
 		["profile"] = profileKey,
 		["locale"] = localeKey,
 		["global"] = true,
@@ -366,10 +353,10 @@ end
 -- handle PLAYER_LOGOUT
 -- strip all defaults from all databases
 -- and cleans up empty sections
-local function logoutHandler()
+local function logoutHandler(frame, event)
 	if event == "PLAYER_LOGOUT" then
 		for db in pairs(AceDB.db_registry) do
-			db.callbacks:Fire("OnDatabaseShutdown", 1, db)
+			db.callbacks:Fire("OnDatabaseShutdown", db)
 			db:RegisterDefaults(nil)

 			-- cleanup sections that are empty without defaults
@@ -449,7 +436,7 @@ function DBObjectLib:SetProfile(name)
 	local defaults = self.defaults and self.defaults.profile

 	-- Callback: OnProfileShutdown, database
-	self.callbacks:Fire("OnProfileShutdown", 1, self)
+	self.callbacks:Fire("OnProfileShutdown", self)

 	if oldProfile and defaults then
 		-- Remove the defaults from the old profile
@@ -473,7 +460,7 @@ function DBObjectLib:SetProfile(name)
 	end

 	-- Callback: OnProfileChanged, database, newProfileKey
-	self.callbacks:Fire("OnProfileChanged", 2, self, name)
+	self.callbacks:Fire("OnProfileChanged", self, name)
 end

 --- Returns a table with the names of the existing profiles in the database.
@@ -549,7 +536,7 @@ function DBObjectLib:DeleteProfile(name, silent)
 	end

 	-- Callback: OnProfileDeleted, database, profileKey
-	self.callbacks:Fire("OnProfileDeleted", 2, self, name)
+	self.callbacks:Fire("OnProfileDeleted", self, name)
 end

 --- Copies a named profile into the current profile, overwriting any conflicting
@@ -585,7 +572,7 @@ function DBObjectLib:CopyProfile(name, silent)
 	end

 	-- Callback: OnProfileCopied, database, sourceProfileKey
-	self.callbacks:Fire("OnProfileCopied", 2, self, name)
+	self.callbacks:Fire("OnProfileCopied", self, name)
 end

 --- Resets the current profile to the default values (if specified).
@@ -612,7 +599,7 @@ function DBObjectLib:ResetProfile(noChildren, noCallbacks)

 	-- Callback: OnProfileReset, database
 	if not noCallbacks then
-		self.callbacks:Fire("OnProfileReset", 2, self, self.keys["profile"])
+		self.callbacks:Fire("OnProfileReset", self)
 	end
 end

@@ -643,9 +630,9 @@ function DBObjectLib:ResetDB(defaultProfile)
 	end

 	-- Callback: OnDatabaseReset, database
-	self.callbacks:Fire("OnDatabaseReset", 1, self)
+	self.callbacks:Fire("OnDatabaseReset", self)
 	-- Callback: OnProfileChanged, database, profileKey
-	self.callbacks:Fire("OnProfileChanged", 2, self, self.keys["profile"])
+	self.callbacks:Fire("OnProfileChanged", self, self.keys["profile"])

 	return self
 end
@@ -1,3 +1,4 @@
-<Ui xmlns="http://www.blizzard.com/wow/ui/">
+<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
+..\FrameXML\UI.xsd">
 	<Script file="AceDB-3.0.lua"/>
 </Ui>