From 48828d172aca39179af1cf66d4eb994bdda67b6f Mon Sep 17 00:00:00 2001
From: pigmonkey <teh.pigmonkey@gmail.com>
Date: Tue, 9 Aug 2011 19:46:13 -0400
Subject: [PATCH] Added EJ 'fix', fixed clickToPaste options, fixed raid frame
 showing repeatedly

---
 modules/macros.lua        | 12 ++++++++++++
 modules/miscellaneous.lua |  5 ++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/modules/macros.lua b/modules/macros.lua
index ed6869b..7b2808e 100644
--- a/modules/macros.lua
+++ b/modules/macros.lua
@@ -21,6 +21,7 @@ function mod:OnInitialize()
 	self:RegisterSlashCommand("Countdown", "cd", "countdown")
 	self:RegisterSlashCommand("RosterCheck", "rc", "rostercheck")
 	self:RegisterSlashCommand("AuctionHouseBuyout", "ahbo")
+	self:RegisterSlashCommand("EJFix", "ej")
 	self:Hook("QueryAuctionItems", true)
 end
 
@@ -198,3 +199,14 @@ function mod:QueryAuctionItems()
 	wipe(bought)
 end
 
+-- Encounter Journal
+function mod:EJFix()
+	for i=1,100 do
+		local b = _G["EncounterJournalInfoHeader"..i]
+		if b then 
+			b:SetFrameLevel(b:GetParent():GetFrameLevel()+10)
+		else
+			break
+		end
+	end
+end
diff --git a/modules/miscellaneous.lua b/modules/miscellaneous.lua
index 8ca0d24..0a556b5 100644
--- a/modules/miscellaneous.lua
+++ b/modules/miscellaneous.lua
@@ -8,6 +8,7 @@ local defaults = {
 	achieveFilter = true,
 	markMsgFilter = true,
 	officerPhone = true,
+	clickToPaste = true,
 }
 local options = {
 	rollTally = {
@@ -50,6 +51,7 @@ function mod:OnInitialize()
 
 	-- allow max camera zoom
 	ConsoleExec("cameradistancemaxfactor 5")
+	CompactRaidFrameContainer.Show = CompactRaidFrameContainer.Hide
 end
 
 
@@ -334,7 +336,7 @@ end
 -- Officer Chat Link -----------------------------------------------------------
 local SetItemRefHook = SetItemRef
 function SetItemRef(id, text, button, chatFrame, ...)
-	if IsControlKeyDown() then
+	if IsControlKeyDown() and db.clickToPaste then
 		local name = id:match("player:(.-):")
 		local prefix, message
 		for i=1,select("#", chatFrame:GetRegions()) do
@@ -352,6 +354,7 @@ function SetItemRef(id, text, button, chatFrame, ...)
 		end
 
 		if name and message then
+			message = message:gsub("|c%x%x%x%x%x%x%x%x(.-)|r", "%1")
 			SendChatMessage(("%s: %s"):format(name, message), "officer")
 			return
 		end