Quantcast

game menu frame level adjustment and added a toggle for using party frames for 5-man raids

Steven Jackson [06-29-15 - 04:14]
game menu frame level adjustment and added a toggle for using party frames for 5-man raids
Filename
SVUI_!Core/system/funstuff.lua
SVUI_Chat/SVUI_Chat.lua
diff --git a/SVUI_!Core/system/funstuff.lua b/SVUI_!Core/system/funstuff.lua
index 575e331..e7fc140 100644
--- a/SVUI_!Core/system/funstuff.lua
+++ b/SVUI_!Core/system/funstuff.lua
@@ -70,6 +70,11 @@ local AFK_SEQUENCES = {
 local Kill_AFK_Widget = function()
 	if(InCombatLockdown()) then return end
 	SV.AFK:SetScript("OnMouseDown", nil)
+	for i,name in pairs(CHAT_FRAMES) do
+		if(_G[name]) then
+			_G[name]:EnableMouse(true);
+		end
+	end
 	UIParent:Show();
 	SV.AFK:SetAlpha(0);
 	SV.AFK:Hide();
diff --git a/SVUI_Chat/SVUI_Chat.lua b/SVUI_Chat/SVUI_Chat.lua
index 70ae98e..eb7d0b3 100644
--- a/SVUI_Chat/SVUI_Chat.lua
+++ b/SVUI_Chat/SVUI_Chat.lua
@@ -326,22 +326,20 @@ do
 				local playerData, playerName = message:match(PLAYER_PATTERN)

 				if(playerData) then
+					local strName = playerName
 					if(HIDE_REALM) then
 						if(playerName:match("|cff")) then
-							playerName = playerName:gsub(GENERAL_REALM_PATTERN, "")
-							message = message:gsub(PLAYER_PATTERN, PLAYER_LINK:format(playerData, playerName))
+							strName = playerName:gsub(GENERAL_REALM_PATTERN, "")
 						else
-							playerName = playerName:match("[^%-]+")
-							local strName = "[" .. playerName .. "]"
-							message = message:gsub(PLAYER_PATTERN, PLAYER_LINK:format(playerData, strName))
+							strName = playerName:match("[^%-]+")
 						end
 					else
-						local parsedName = playerData:match(GENERAL_LINK_PATTERN)
-						local parsedRealm = parsedName:match(GENERAL_REALM_PATTERN)
-						playerName = playerName:match("[^%-]+")
-						local strName = "[" .. playerName .. "]"
-						message = message:gsub(PLAYER_PATTERN, PLAYER_LINK:format(playerData, strName))
+						if(not playerName:match("|cff")) then
+							strName = playerName:match("[^%-]+")
+						end
 					end
+					strName = "[" .. strName .. "]"
+					message = message:gsub(PLAYER_PATTERN, PLAYER_LINK:format(playerData, strName))
 				elseif(channelID) then
 					message = message:gsub("(|Hchannel:.-|h): ", "%1 ", 1)
 				end
@@ -772,7 +770,7 @@ do
 		chat:SetFrameLevel(4)
 		chat:SetClampRectInsets(0, 0, 0, 0)
 		chat:SetClampedToScreen(true)
-		chat:SetMovable(true)
+		chat:SetMovable(true);
 		chat:SetUserPlaced(true);

 		chat:RemoveTextures(true)
@@ -1623,10 +1621,13 @@ function MOD:Load()
 	self:UpdateLocals()

 	for i,name in pairs(CHAT_FRAMES) do
-		_G[name].oldAlpha = 0;
-		local key = format("SVUI_ChatFrameDock%d", i)
-		if((not self.private.activeTabs[key]) and (i < 4)) then
-			self.private.activeTabs[key] = true
+		if(_G[name]) then
+			_G[name]:SetMovable(true);
+			_G[name].oldAlpha = 0;
+			local key = format("SVUI_ChatFrameDock%d", i)
+			if((not self.private.activeTabs[key]) and (i < 4)) then
+				self.private.activeTabs[key] = true
+			end
 		end
 	end