sod error

ElvUI/Cata/Modules/Skins/Friends.lua

@@ -272,24 +272,6 @@ function S:FriendsFrame()
 	end
 
 	hooksecurefunc('WhoList_Update', UpdateWhoList)
-
-	-- Raid Tab
-	S:HandleButton(_G.RaidFrameRaidInfoButton)
-	S:HandleButton(_G.RaidFrameConvertToRaidButton)
-	S:HandleCheckBox(_G.RaidFrameAllAssistCheckButton)
-
-	-- Raid Info Frame
-	_G.RaidInfoFrame:StripTextures(true)
-	_G.RaidInfoFrame:CreateBackdrop('Transparent')
-	_G.RaidInfoFrame:HookScript('OnShow', RaidInfoFrame_OnShow)
-
-	_G.RaidInfoScrollFrame:StripTextures()
-	S:HandleScrollBar(_G.RaidInfoScrollFrameScrollBar)
-	S:HandleCloseButton(_G.RaidInfoCloseButton, _G.RaidInfoFrame)
-
-	_G.RaidInfoInstanceLabel:SetTemplate()
-	_G.RaidInfoIDLabel:SetTemplate()
-	S:HandleButton(_G.RaidInfoCancelButton)
 end
 
 S:AddCallback('FriendsFrame')

ElvUI/Cata/Modules/Skins/Load_Skins.xml

@@ -36,6 +36,7 @@
 	<Script file='Merchant.lua'/>
 	<Script file='MirrorTimers.lua'/>
 	<Script file='Misc.lua'/>
+	<Script file='NonRaid.lua'/>
 	<Script file='Petition.lua'/>
 	<Script file='PVP.lua'/>
 	<Script file='Quest.lua'/>

ElvUI/Cata/Modules/Skins/NonRaid.lua

@@ -0,0 +1,44 @@
+local E, L, V, P, G = unpack(ElvUI)
+local S = E:GetModule('Skins')
+
+local _G = _G
+local next = next
+
+function S:RaidInfoFrame()
+	if not (E.private.skins.blizzard.enable and E.private.skins.blizzard.nonraid) then return end
+
+	for _, frame in next, {
+		_G.RaidInfoFrame,
+		_G.RaidInfoInstanceLabel,
+		_G.RaidInfoIDLabel,
+	} do
+		frame:StripTextures()
+	end
+
+	for _, texture in next, {
+		_G.RaidInfoScrollFrameScrollBarBG,
+		_G.RaidInfoScrollFrameScrollBarTop,
+		_G.RaidInfoScrollFrameScrollBarBottom,
+		_G.RaidInfoScrollFrameScrollBarMiddle,
+	} do
+		texture:Kill()
+	end
+
+	for _, button in next, {
+		_G.RaidFrameConvertToRaidButton,
+		_G.RaidFrameRaidInfoButton,
+		_G.RaidInfoExtendButton,
+		_G.RaidInfoCancelButton,
+	} do
+		S:HandleButton(button)
+	end
+
+	local RaidInfoFrame = _G.RaidInfoFrame
+	RaidInfoFrame:SetTemplate('Transparent')
+
+	S:HandleCloseButton(_G.RaidInfoCloseButton,RaidInfoFrame)
+	S:HandleTrimScrollBar(RaidInfoFrame.ScrollBar)
+	S:HandleCheckBox(_G.RaidFrameAllAssistCheckButton)
+end
+
+S:AddCallback('RaidInfoFrame')

ElvUI/Classic/Modules/Skins/Friends.lua

@@ -454,21 +454,6 @@ function S:FriendsFrame()
 
 	S:HandleButton(_G.GuildControlPopupAcceptButton)
 	S:HandleButton(_G.GuildControlPopupFrameCancelButton)
-
-	-- Raid Frame
-	S:HandleButton(_G.RaidFrameConvertToRaidButton)
-	_G.RaidFrameConvertToRaidButton:Point('BOTTOMRIGHT', -6, 4)
-	S:HandleButton(_G.RaidFrameRaidInfoButton)
-	S:HandleCheckBox(_G.RaidFrameAllAssistCheckButton)
-
-	-- Raid Info Frame
-	_G.RaidInfoFrame:StripTextures(true)
-	_G.RaidInfoFrame:CreateBackdrop('Transparent')
-	_G.RaidInfoFrame:HookScript('OnShow', RaidInfoFrame_OnShow)
-
-	_G.RaidInfoScrollFrame:StripTextures()
-	S:HandleScrollBar(_G.RaidInfoScrollFrameScrollBar)
-	S:HandleCloseButton(_G.RaidInfoCloseButton, _G.RaidInfoFrame)
 end
 
 S:AddCallback('FriendsFrame')

ElvUI/Classic/Modules/Skins/Load_Skins.xml

@@ -30,6 +30,7 @@
 	<Script file='Merchant.lua'/>
 	<Script file='MirrorTimers.lua'/>
 	<Script file='Misc.lua'/>
+	<Script file='NonRaid.lua'/>
 	<Script file='Petition.lua'/>
 	<Script file='Quest.lua'/>
 	<Script file='QuestTimers.lua'/>

ElvUI/Classic/Modules/Skins/NonRaid.lua

@@ -0,0 +1,44 @@
+local E, L, V, P, G = unpack(ElvUI)
+local S = E:GetModule('Skins')
+
+local _G = _G
+local next = next
+
+function S:RaidInfoFrame()
+	if not (E.private.skins.blizzard.enable and E.private.skins.blizzard.nonraid) then return end
+
+	for _, frame in next, {
+		_G.RaidInfoFrame,
+		_G.RaidInfoInstanceLabel,
+		_G.RaidInfoIDLabel,
+	} do
+		frame:StripTextures()
+	end
+
+	for _, texture in next, {
+		_G.RaidInfoScrollFrameScrollBarBG,
+		_G.RaidInfoScrollFrameScrollBarTop,
+		_G.RaidInfoScrollFrameScrollBarBottom,
+		_G.RaidInfoScrollFrameScrollBarMiddle,
+	} do
+		texture:Kill()
+	end
+
+	for _, button in next, {
+		_G.RaidFrameConvertToRaidButton,
+		_G.RaidFrameRaidInfoButton,
+		_G.RaidInfoExtendButton,
+		_G.RaidInfoCancelButton,
+	} do
+		S:HandleButton(button)
+	end
+
+	local RaidInfoFrame = _G.RaidInfoFrame
+	RaidInfoFrame:SetTemplate('Transparent')
+
+	S:HandleCloseButton(_G.RaidInfoCloseButton,RaidInfoFrame)
+	S:HandleTrimScrollBar(RaidInfoFrame.ScrollBar)
+	S:HandleCheckBox(_G.RaidFrameAllAssistCheckButton)
+end
+
+S:AddCallback('RaidInfoFrame')