Skip to content

Commit

Permalink
git one as well
Browse files Browse the repository at this point in the history
  • Loading branch information
kodewdle committed Mar 31, 2024
1 parent 67d3908 commit 18b599c
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 16 deletions.
21 changes: 8 additions & 13 deletions ElvUI/Core/General/Core.lua
Original file line number Diff line number Diff line change
Expand Up @@ -900,14 +900,12 @@ end
do
local SendMessageWaiting -- only allow 1 delay at a time regardless of eventing
function E:SendMessage()
if not E.versionGit then
if IsInRaid() then
C_ChatInfo_SendAddonMessage('ELVUI_VERSIONCHK', E.version, (not IsInRaid(LE_PARTY_CATEGORY_HOME) and IsInRaid(LE_PARTY_CATEGORY_INSTANCE)) and 'INSTANCE_CHAT' or 'RAID')
elseif IsInGroup() then
C_ChatInfo_SendAddonMessage('ELVUI_VERSIONCHK', E.version, (not IsInGroup(LE_PARTY_CATEGORY_HOME) and IsInGroup(LE_PARTY_CATEGORY_INSTANCE)) and 'INSTANCE_CHAT' or 'PARTY')
elseif IsInGuild() then
C_ChatInfo_SendAddonMessage('ELVUI_VERSIONCHK', E.version, 'GUILD')
end
if IsInRaid() then
C_ChatInfo_SendAddonMessage('ELVUI_VERSIONCHK', E.version, (not IsInRaid(LE_PARTY_CATEGORY_HOME) and IsInRaid(LE_PARTY_CATEGORY_INSTANCE)) and 'INSTANCE_CHAT' or 'RAID')
elseif IsInGroup() then
C_ChatInfo_SendAddonMessage('ELVUI_VERSIONCHK', E.version, (not IsInGroup(LE_PARTY_CATEGORY_HOME) and IsInGroup(LE_PARTY_CATEGORY_INSTANCE)) and 'INSTANCE_CHAT' or 'PARTY')
elseif IsInGuild() then
C_ChatInfo_SendAddonMessage('ELVUI_VERSIONCHK', E.version, 'GUILD')
end

SendMessageWaiting = nil
Expand Down Expand Up @@ -959,11 +957,8 @@ do
local f = CreateFrame('Frame')
f:SetScript('OnEvent', SendRecieve)
f:RegisterEvent('CHAT_MSG_ADDON')

if not E.versionGit then
f:RegisterEvent('GROUP_ROSTER_UPDATE')
f:RegisterEvent('PLAYER_ENTERING_WORLD')
end
f:RegisterEvent('GROUP_ROSTER_UPDATE')
f:RegisterEvent('PLAYER_ENTERING_WORLD')
end

function E:UpdateStart(skipCallback, skipUpdateDB)
Expand Down
2 changes: 1 addition & 1 deletion ElvUI/Core/General/Tags.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1201,7 +1201,7 @@ do
end

do
local highestVersion = E.versionGit and 0 or E.version
local highestVersion = E.version
E:AddTag('ElvUI-Users', 20, function(unit)
if E.UserList and next(E.UserList) then
local name, realm = UnitName(unit)
Expand Down
2 changes: 1 addition & 1 deletion ElvUI/Core/Modules/Tooltip/Tooltip.lua
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ function TT:SetUnitText(tt, unit, isPlayerUnit)
local addonUser = E.UserList[nameRealm]
if addonUser then
local same = addonUser == E.version
tt:AddDoubleLine(L["ElvUI Version:"], format('%.2f', addonUser), nil, nil, nil, E.versionGit and 1 or same and 0.2 or 1, E.versionGit and 1 or same and 1 or 0.2, E.versionGit and 1 or 0.2)
tt:AddDoubleLine(L["ElvUI Version:"], format('%.2f', addonUser), nil, nil, nil, same and 0.2 or 1, same and 1 or 0.2, 0.2)
end
end

Expand Down
2 changes: 1 addition & 1 deletion ElvUI/Core/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ end
function E:ParseVersionString(addon)
local version = GetAddOnMetadata(addon, 'Version')
if strfind(version, 'project%-version') then
return 99999, 'Development', nil, true
return 13.60, '13.60-git', nil, true
else
local release, extra = strmatch(version, '^v?([%d.]+)(.*)')
return tonumber(release), release..extra, extra ~= ''
Expand Down

0 comments on commit 18b599c

Please sign in to comment.