Quantcast

Merge branch 'master' of git.tukui.org:repooc/elvui-shadowandlight

Repooc [09-28-16 - 05:05]
Merge branch 'master' of git.tukui.org:repooc/elvui-shadowandlight
Filename
ElvUI_SLE/core/install.lua
ElvUI_SLE/modules/chat/chat.lua
ElvUI_SLE/modules/chat/links.lua
ElvUI_SLE/modules/minimap/locationbar.lua
ElvUI_SLE/modules/quests/quests.lua
ElvUI_SLE/modules/sledatatexts/currency.lua
ElvUI_SLE/modules/sledatatexts/regen.lua
ElvUI_SLE/skins/blizzard/objectiveTracker.lua
diff --git a/ElvUI_SLE/core/install.lua b/ElvUI_SLE/core/install.lua
index 745cc0b..46a419b 100644
--- a/ElvUI_SLE/core/install.lua
+++ b/ElvUI_SLE/core/install.lua
@@ -579,8 +579,8 @@ function PI:DarthSetup()
 		E.db["movers"]["DebuffsMover"] = "TOPRIGHT,ElvUIParent,TOPRIGHT,-187,-158"
 		E.db["movers"]["ElvUF_TargetMover"] = "BOTTOM,ElvUIParent,BOTTOM,211,189"
 		E.db["movers"]["PlayerNameplate"] = "BOTTOM,ElvUIParent,BOTTOM,0,426"
-		E.db["movers"]["ElvUIBankMover"] = "BOTTOMLEFT,ElvUIParent,BOTTOMLEFT,153,199"
-		E.db["movers"]["ElvUIBagMover"] = "BOTTOMRIGHT,ElvUIParent,BOTTOMRIGHT,-152,199"
+		E.db["movers"]["ElvUIBankMover"] = "BOTTOMLEFT,ElvUIParent,BOTTOMLEFT,0,199"
+		E.db["movers"]["ElvUIBagMover"] = "BOTTOMRIGHT,ElvUIParent,BOTTOMRIGHT,0,199"
 	end

 	if T.IsAddOnLoaded("ElvUI_AuraBarsMovers") then
@@ -628,6 +628,8 @@ function PI:DarthSetup()
 	E.global["sle"]["advanced"]["optionsLimits"] = true
 	E.global["sle"]["advanced"]["cyrillics"]["commands"] = true
 	E.global["general"]["animateConfig"] = false
+	E.global["general"]["commandBarSetting"] = "DISABLED"
+	E.global["general"]["fadeMapWhenMoving"] = false

 	if layout then
 		if layout == 'tank' then
diff --git a/ElvUI_SLE/modules/chat/chat.lua b/ElvUI_SLE/modules/chat/chat.lua
index 4ebe4e2..36991c0 100644
--- a/ElvUI_SLE/modules/chat/chat.lua
+++ b/ElvUI_SLE/modules/chat/chat.lua
@@ -130,6 +130,12 @@ function C:GMIconUpdate()
 end

 function C:Combat(event)
+	--To get rid of "script ran too long" in links
+	if event == "PLAYER_REGEN_DISABLED" then
+		C:Unhook("SetItemRef")
+	elseif event == "PLAYER_REGEN_ENABLED" then
+		C:RawHook("SetItemRef", true)
+	end
 	if C.db.combathide == "NONE" or not C.db.combathide then return end
 	if event == "PLAYER_REGEN_DISABLED" then
 		if C.db.combathide == "BOTH" or C.db.combathide == "RIGHT" then
@@ -140,6 +146,7 @@ function C:Combat(event)
 			LeftChatPanel:Hide()
 			LeftChatToggleButton:Hide()
 		end
+
 	elseif event == "PLAYER_REGEN_ENABLED" then
 		if not RightChatPanel:IsShown() then
 			RightChatPanel:Show()
diff --git a/ElvUI_SLE/modules/chat/links.lua b/ElvUI_SLE/modules/chat/links.lua
index 7fdd779..6ce418d 100644
--- a/ElvUI_SLE/modules/chat/links.lua
+++ b/ElvUI_SLE/modules/chat/links.lua
@@ -164,32 +164,30 @@ function C:ParseChatEventInv(event, msg, sender, ...)
 end

 function C:SetItemRef(link, text, button, chatframe)
-	if not T.InCombatLockdown() then
-		local linktype, id = T.split(":", link)
-		if C.db.dpsSpam then
-			if linktype == "SLD" then
-				local meterID = T.tonumber(id)
-				-- put stuff in the ItemRefTooltip from FrameXML
-				ShowUIPanel(ItemRefTooltip);
-				if ( not ItemRefTooltip:IsShown() ) then
-					ItemRefTooltip:SetOwner(UIParent, "ANCHOR_PRESERVE");
-				end
-				ItemRefTooltip:ClearLines()
-				ItemRefTooltip:AddLine(C.Meters[meterID].title)
-				ItemRefTooltip:AddLine(T.format(L["Reported by %s"],C.Meters[meterID].src))
-				for _,message in T.ipairs(C.Meters[meterID].data) do ItemRefTooltip:AddLine(message,1,1,1) end
-				ItemRefTooltip:Show()
-				return nil
+	local linktype, id = T.split(":", link)
+	if C.db.dpsSpam then
+		if linktype == "SLD" then
+			local meterID = T.tonumber(id)
+			-- put stuff in the ItemRefTooltip from FrameXML
+			ShowUIPanel(ItemRefTooltip);
+			if ( not ItemRefTooltip:IsShown() ) then
+				ItemRefTooltip:SetOwner(UIParent, "ANCHOR_PRESERVE");
 			end
-		end
-		if IsAltKeyDown() and linktype == "player" and E.db.sle.chat.invite.altInv then
-			InviteUnit(id)
-			return nil
-		elseif linktype == "invite" then
-			InviteUnit(id)
+			ItemRefTooltip:ClearLines()
+			ItemRefTooltip:AddLine(C.Meters[meterID].title)
+			ItemRefTooltip:AddLine(T.format(L["Reported by %s"],C.Meters[meterID].src))
+			for _,message in T.ipairs(C.Meters[meterID].data) do ItemRefTooltip:AddLine(message,1,1,1) end
+			ItemRefTooltip:Show()
 			return nil
 		end
 	end
+	if IsAltKeyDown() and linktype == "player" and E.db.sle.chat.invite.altInv then
+		InviteUnit(id)
+		return nil
+	elseif linktype == "invite" then
+		InviteUnit(id)
+		return nil
+	end
 	return self.hooks.SetItemRef(link, text, button)
 end

@@ -225,7 +223,7 @@ end
 function C:InitLinks()
 	C:SpamFilter()
 	C:CreateInvKeys()
-	C:RawHook(nil, "SetItemRef", true)
+	C:RawHook("SetItemRef", true)
 	-- Borrowed from Deadly Boss Mods
 	do
 		local old = ItemRefTooltip.SetHyperlink -- we have to hook this function since the default ChatFrame code assumes that all links except for player and channel links are valid arguments for this function
diff --git a/ElvUI_SLE/modules/minimap/locationbar.lua b/ElvUI_SLE/modules/minimap/locationbar.lua
index 4060b6b..578179d 100644
--- a/ElvUI_SLE/modules/minimap/locationbar.lua
+++ b/ElvUI_SLE/modules/minimap/locationbar.lua
@@ -113,7 +113,7 @@ LP.Spells = {
 			[9] = {text = T.GetSpellInfo(132627),icon = SLE:GetIconFromID("spell", 132627),secure = {buttonType = "spell",ID = 132627}, UseTooltip = true},-- TP:Vale of Eternal Blossoms
 			[10] = {text = T.GetSpellInfo(120145),icon = SLE:GetIconFromID("spell", 120145),secure = {buttonType = "spell",ID = 120145}, UseTooltip = true},-- TP:Ancient Dalaran
 			[11] = {text = T.GetSpellInfo(176242),icon = SLE:GetIconFromID("spell", 176242),secure = {buttonType = "spell",ID = 176242}, UseTooltip = true},-- TP:Warspear
-			[12] = {text = T.GetSpellInfo(224873),icon = SLE:GetIconFromID("spell", 224873),secure = {buttonType = "spell",ID = 224873}, UseTooltip = true},-- TP:Dalaran - BI
+			[12] = {text = T.GetSpellInfo(224869),icon = SLE:GetIconFromID("spell", 224869),secure = {buttonType = "spell",ID = 224869}, UseTooltip = true},-- TP:Dalaran - BI
 		},
 		["Alliance"] = {
 			[1] = {text = T.GetSpellInfo(3561),icon = SLE:GetIconFromID("spell", 3561),secure = {buttonType = "spell",ID = 3561}, UseTooltip = true},-- TP:Stormwind
@@ -127,7 +127,7 @@ LP.Spells = {
 			[9] = {text = T.GetSpellInfo(132621),icon = SLE:GetIconFromID("spell", 132621),secure = {buttonType = "spell",ID = 132621}, UseTooltip = true},-- TP:Vale of Eternal Blossoms
 			[10] = {text = T.GetSpellInfo(120145),icon = SLE:GetIconFromID("spell", 120145),secure = {buttonType = "spell",ID = 120145}, UseTooltip = true},-- TP:Ancient Dalaran
 			[11] = {text = T.GetSpellInfo(176248),icon = SLE:GetIconFromID("spell", 176248),secure = {buttonType = "spell",ID = 176248}, UseTooltip = true},-- TP:StormShield
-			[12] = {text = T.GetSpellInfo(224873),icon = SLE:GetIconFromID("spell", 224873),secure = {buttonType = "spell",ID = 224873}, UseTooltip = true},-- TP:Dalaran - BI
+			[12] = {text = T.GetSpellInfo(224869),icon = SLE:GetIconFromID("spell", 224869),secure = {buttonType = "spell",ID = 224869}, UseTooltip = true},-- TP:Dalaran - BI
 		},
 	},
 	["portals"] = {
diff --git a/ElvUI_SLE/modules/quests/quests.lua b/ElvUI_SLE/modules/quests/quests.lua
index fd1d512..8605820 100644
--- a/ElvUI_SLE/modules/quests/quests.lua
+++ b/ElvUI_SLE/modules/quests/quests.lua
@@ -7,10 +7,14 @@ local IsResting = IsResting
 local statedriver = {
 	["FULL"] = function(frame)
 		ObjectiveTracker_Expand()
+		-- TextFix(minimizeButton, "full")
+		minimizeButton.text:SetText("-")
 		frame:Show()
 	end,
 	["COLLAPSED"] = function(frame)
 		ObjectiveTracker_Collapse()
+		minimizeButton.text:SetText("+")
+		-- TextFix(minimizeButton, "collaped")
 		frame:Show()
 	end,
 	["HIDE"] = function(frame)
@@ -98,7 +102,7 @@ function Q:QUEST_COMPLETE()
 	for index = 1, num do
 		local link = GetQuestItemLink("choice", index);
 		if link then
-			local price = select(11, GetItemInfo(link))
+			local price = T.select(11, GetItemInfo(link))
 			if price and price > highest then
 				highest = price
 				choice = index
diff --git a/ElvUI_SLE/modules/sledatatexts/currency.lua b/ElvUI_SLE/modules/sledatatexts/currency.lua
index 7f574eb..4a60b04 100644
--- a/ElvUI_SLE/modules/sledatatexts/currency.lua
+++ b/ElvUI_SLE/modules/sledatatexts/currency.lua
@@ -116,7 +116,8 @@ end
 local HiddenCurrency = {}

 local function UnusedCheck()
-	if GetOption('Unused') then HiddenCurrency = {}; return end
+	-- if GetOption('Unused') then HiddenCurrency = {}; return end
+	T.twipe(HiddenCurrency)
 	for i = 1, T.GetCurrencyListSize() do
 		local name, _, _, isUnused = GetCurrencyListInfo(i)
 		if isUnused then
diff --git a/ElvUI_SLE/modules/sledatatexts/regen.lua b/ElvUI_SLE/modules/sledatatexts/regen.lua
index 87f803b..0c03627 100644
--- a/ElvUI_SLE/modules/sledatatexts/regen.lua
+++ b/ElvUI_SLE/modules/sledatatexts/regen.lua
@@ -2,15 +2,16 @@ local SLE, T, E, L, V, P, G = unpack(select(2, ...))
 local DT = E:GetModule('DataTexts')
 local MANA_REGEN = MANA_REGEN
 local displayNumberString = ''
+local displayNumberStringShort = ''
 local lastPanel;
 local GetManaRegen = GetManaRegen

 local function OnEvent(self, event, unit)
 	local baseMR, castingMR = GetManaRegen()
 	if T.InCombatLockdown() then
-		self.text:SetFormattedText(displayNumberString, E.db.sle.dt.regen.short and "Mp5" or MANA_REGEN, castingMR*5)
+		self.text:SetFormattedText(E.db.sle.dt.regen.short and displayNumberStringShort or displayNumberString, E.db.sle.dt.regen.short and "Mp5" or MANA_REGEN, E.db.sle.dt.regen.short and E:ShortValue(castingMR*5) or castingMR*5)
 	else
-		self.text:SetFormattedText(displayNumberString, E.db.sle.dt.regen.short and "Mp5" or MANA_REGEN, baseMR*5)
+		self.text:SetFormattedText(E.db.sle.dt.regen.short and displayNumberStringShort or displayNumberString, E.db.sle.dt.regen.short and "Mp5" or MANA_REGEN,  E.db.sle.dt.regen.short and E:ShortValue(baseMR*5) or baseMR*5)
 	end

 	lastPanel = self
@@ -18,6 +19,7 @@ end

 local function ValueColorUpdate(hex, r, g, b)
 	displayNumberString = T.join("", "%s: ", hex, "%.2f|r")
+	displayNumberStringShort = T.join("", "%s: ", hex, "%s|r")

 	if lastPanel ~= nil then
 		OnEvent(lastPanel)
diff --git a/ElvUI_SLE/skins/blizzard/objectiveTracker.lua b/ElvUI_SLE/skins/blizzard/objectiveTracker.lua
index 359cb8c..69a9081 100644
--- a/ElvUI_SLE/skins/blizzard/objectiveTracker.lua
+++ b/ElvUI_SLE/skins/blizzard/objectiveTracker.lua
@@ -241,11 +241,13 @@ local function ObjectiveReskin()
 		_G["ObjectiveTrackerBlocksFrame"].AchievementHeader.SLE_Underline = Sk:CreateUnderline(_G["ObjectiveTrackerBlocksFrame"].AchievementHeader, flat, true, height)
 		_G['BONUS_OBJECTIVE_TRACKER_MODULE'].Header.SLE_Underline = Sk:CreateUnderline(_G['BONUS_OBJECTIVE_TRACKER_MODULE'].Header, flat, true, height)
 		_G["ObjectiveTrackerBlocksFrame"].ScenarioHeader.SLE_Underline = Sk:CreateUnderline(_G["ObjectiveTrackerBlocksFrame"].ScenarioHeader, flat, true, height)
+		_G["WORLD_QUEST_TRACKER_MODULE"].Header.SLE_Underline = Sk:CreateUnderline(_G["WORLD_QUEST_TRACKER_MODULE"].Header, flat, true, height)

 		T.tinsert(underlines, _G["ObjectiveTrackerBlocksFrame"].QuestHeader.SLE_Underline)
 		T.tinsert(underlines, _G["ObjectiveTrackerBlocksFrame"].AchievementHeader.SLE_Underline)
 		T.tinsert(underlines, _G['BONUS_OBJECTIVE_TRACKER_MODULE'].Header.SLE_Underline)
 		T.tinsert(underlines, _G["ObjectiveTrackerBlocksFrame"].ScenarioHeader.SLE_Underline)
+		T.tinsert(underlines, _G["WORLD_QUEST_TRACKER_MODULE"].Header.SLE_Underline)

 		Sk:Update_ObjectiveTrackerUnderlinesVisibility()
 		Sk:Update_ObjectiveTrackerUnderlinesColor()