@@ -44,10 +44,8 @@ [1] http://www.wowwiki.com/API_UnitAura --]] -local parent = debugstack():match[[\AddOns\(.-)\]] -local global = GetAddOnMetadata(parent, 'X-oUF') -assert(global, 'X-oUF needs to be defined in the parent add-on.') -local oUF = _G[global] +local parent, ns = ... +local oUF = ns.oUF local OnEnter = function(self) if(not self:IsVisible()) then return end elements/aura.lua @@ -13,10 +13,8 @@ - :CustomTimeText(duration) --]] -local parent = debugstack():match[[\AddOns\(.-)\]] -local global = GetAddOnMetadata(parent, 'X-oUF') -assert(global, 'X-oUF needs to be defined in the parent add-on.') -local oUF = _G[global] +local parent, ns = ... +local oUF = ns.oUF local noop = function() end local UnitName = UnitName elements/castbar.lua @@ -1,7 +1,5 @@ -local parent = debugstack():match[[\AddOns\(.-)\]] -local global = GetAddOnMetadata(parent, 'X-oUF') -assert(global, 'X-oUF needs to be defined in the parent add-on.') -local oUF = _G[global] +local parent, ns = ... +local oUF = ns.oUF local GetComboPoints = GetComboPoints local MAX_COMBO_POINTS = MAX_COMBO_POINTS elements/cpoints.lua @@ -1,7 +1,5 @@ -local parent = debugstack():match[[\AddOns\(.-)\]] -local global = GetAddOnMetadata(parent, 'X-oUF') -assert(global, 'X-oUF needs to be defined in the parent add-on.') -local oUF = _G[global] +local parent, ns = ... +local oUF = ns.oUF local Update = function(self, event, unit) if(self.unit ~= unit) then return end elements/happiness.lua @@ -25,10 +25,8 @@ will disable the above color settings. - :PostUpdateHealth(event, unit, bar, min, max) --]] -local parent = debugstack():match[[\AddOns\(.-)\]] -local global = GetAddOnMetadata(parent, 'X-oUF') -assert(global, 'X-oUF needs to be defined in the parent add-on.') -local oUF = _G[global] +local parent, ns = ... +local oUF = ns.oUF local OnHealthUpdate do elements/health.lua @@ -1,7 +1,5 @@ -local parent = debugstack():match[[\AddOns\(.-)\]] -local global = GetAddOnMetadata(parent, 'X-oUF') -assert(global, 'X-oUF needs to be defined in the parent add-on.') -local oUF = _G[global] +local parent, ns = ... +local oUF = ns.oUF local Update = function(self, event) local unit = self.unit elements/leader.lua @@ -1,7 +1,5 @@ -local parent = debugstack():match[[\AddOns\(.-)\]] -local global = GetAddOnMetadata(parent, 'X-oUF') -assert(global, 'X-oUF needs to be defined in the parent add-on.') -local oUF = _G[global] +local parent, ns = ... +local oUF = ns.oUF local Update = function(self, event, unit) if(not UnitIsUnit(self.unit, unit)) then return end elements/portraits.lua @@ -24,10 +24,8 @@ will disable the above color settings. - :PostUpdatePower(event, unit, bar, min, max) --]] -local parent = debugstack():match[[\AddOns\(.-)\]] -local global = GetAddOnMetadata(parent, 'X-oUF') -assert(global, 'X-oUF needs to be defined in the parent add-on.') -local oUF = _G[global] +local parent, ns = ... +local oUF = ns.oUF local UnitManaMax = UnitManaMax local UnitPowerType = UnitPowerType elements/power.lua @@ -1,7 +1,5 @@ -local parent = debugstack():match[[\AddOns\(.-)\]] -local global = GetAddOnMetadata(parent, 'X-oUF') -assert(global, 'X-oUF needs to be defined in the parent add-on.') -local oUF = _G[global] +local parent, ns = ... +local oUF = ns.oUF local Update = function(self, event, unit) if(unit ~= self.unit) then return end elements/pvp.lua @@ -7,10 +7,8 @@ - outsideRangeAlpha - A number for frame alpha when unit is outside player range. Required. --]] -local parent = debugstack():match[[\AddOns\(.-)\]] -local global = GetAddOnMetadata(parent, 'X-oUF') -assert(global, 'X-oUF needs to be defined in the parent add-on.') -local oUF = _G[global] +local parent, ns = ... +local oUF = ns.oUF local objects = oUF.objects local OnRangeFrame elements/range.lua @@ -1,7 +1,5 @@ -local parent = debugstack():match[[\AddOns\(.-)\]] -local global = GetAddOnMetadata(parent, 'X-oUF') -assert(global, 'X-oUF needs to be defined in the parent add-on.') -local oUF = _G[global] +local parent, ns = ... +local oUF = ns.oUF local GetRaidTargetIndex = GetRaidTargetIndex local SetRaidTargetIconTexture = SetRaidTargetIconTexture elements/ricons.lua @@ -1,7 +1,5 @@ -local parent = debugstack():match[[\AddOns\(.-)\]] -local global = GetAddOnMetadata(parent, 'X-oUF') -assert(global, 'X-oUF needs to be defined in the parent add-on.') -local oUF = _G[global] +local parent, ns = ... +local oUF = ns.oUF do local Update = function(self, event) elements/status.lua @@ -8,10 +8,8 @@ -- - Tag and Untag should be able to handle more than one fontstring at a time. ]] -local parent = debugstack():match[[\AddOns\(.-)\]] -local global = GetAddOnMetadata(parent, 'X-oUF') -assert(global, 'X-oUF needs to be defined in the parent add-on.') -local oUF = _G[global] +local parent, ns = ... +local oUF = ns.oUF local classColors = oUF.colors.class elements/tags.lua @@ -6,11 +6,8 @@ - :OverrideUpdateThreat(event, unit, status) - :PostUpdateThreat(event, unit, status) --]] -if(select(4, GetBuildInfo()) < 3e4) then return end -local parent = debugstack():match[[\AddOns\(.-)\]] -local global = GetAddOnMetadata(parent, 'X-oUF') -assert(global, 'X-oUF needs to be defined in the parent add-on.') -local oUF = _G[global] +local parent, ns = ... +local oUF = ns.oUF local Update = function(self, event, unit) if(unit ~= self.unit) then return end elements/threat.lua @@ -1,7 +1,5 @@ -local parent = debugstack():match[[\AddOns\(.-)\]] -local global = GetAddOnMetadata(parent, 'X-oUF') -assert(global, 'X-oUF needs to be defined in the parent add-on.') -local oUF = _G[global] +local parent, ns = ... +local oUF = ns.oUF local objects = oUF.objects elements/vehicle.lua @@ -1,4 +1,4 @@ -## Interface: 30200 +## Interface: 30300 ## Title: oUF ## Author: Haste ## Version: 1.3.21 oUF.toc @@ -1,6 +1,6 @@ -local parent = debugstack():match[[\AddOns\(.-)\]] +assert(select(4, GetBuildInfo()) >= 30300, "This version of oUF requires patch 3.3 or higher.") +local parent, ns = ... local global = GetAddOnMetadata(parent, 'X-oUF') -assert(global, 'X-oUF needs to be defined in the parent add-on.') local _VERSION = GetAddOnMetadata(parent, 'version') @@ -529,4 +529,5 @@ oUF.version = _VERSION oUF.units = units oUF.objects = objects oUF.colors = colors -_G[global] = oUF +ns.oUF = oUF +if global then _G[global] = oUF end ouf.lua 87d81c778905f39f72419a584b1217896bd01d69 Trond A Ekseth troeks@gmail.com http://github.com/Zariel/ouf/commit/efca6521ad440e34dab403ad40946fd7a3bfe676 efca6521ad440e34dab403ad40946fd7a3bfe676 2009-11-01T14:03:45-08:00 2009-11-01T14:03:45-08:00 Put new addon namespace to good use Conflicts: oUF.toc 4c8d5a34cad8ace225e4aa4ee5d0d5d08c6ecf2f Trond A Ekseth troeks@gmail.com