Merge branch 'dev' into actionbars

ElvUI_Config/Libraries/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua

@@ -7,6 +7,7 @@ local AceCore = LibStub("AceCore-3.0")
 local min, max, floor = math.min, math.max, math.floor
 local pairs, ipairs, type = pairs, ipairs, type
 local tsort, tinsert, tgetn, tsetn = table.sort, table.insert, table.getn, table.setn
+local format = string.format
 
 -- WoW APIs
 local PlaySound = PlaySound
@@ -578,7 +579,7 @@ do
 	local function AddListItem(self, value, text, itemType)
 		if not itemType then itemType = "Dropdown-Item-Toggle" end
 		local exists = AceGUI:GetWidgetVersion(itemType)
-		if not exists then error(("The given item type, %q, does not exist within AceGUI-3.0"):format(tostring(itemType)), 2) end
+		if not exists then error(format("The given item type, %q, does not exist within AceGUI-3.0", tostring(itemType)), 2) end
 
 		local item = AceGUI:Create(itemType)
 		item:SetText(text)

ElvUI_Config/Libraries/AceGUI-3.0/widgets/AceGUIWidget-Slider.lua

@@ -7,7 +7,8 @@ local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
 -- Lua APIs
-local min, max, floor, format = math.min, math.max, math.floor, string.format
+local min, max, floor = math.min, math.max, math.floor
+local format, gsub = string.format, string.gsub
 local tonumber, pairs = tonumber, pairs
 
 -- WoW APIs
@@ -101,7 +102,7 @@ local function EditBox_OnEnterPressed()
 	local self = this.obj
 	local value = this:GetText()
 	if self.ispercent then
-		value = value:gsub('%%', '')
+		value = gsub(value, '%%', '')
 		value = tonumber(value) / 100
 	else
 		value = tonumber(value)

ElvUI_Config/Tooltip.lua

@@ -63,14 +63,24 @@ E.Options.args.tooltip = {
 					name = L["Inspect Info"],
 					desc = L["Display the players talent spec and item level in the tooltip, this may not immediately update when mousing over a unit."],
 				},
-				spellID = {
+				itemPrice = {
 					order = 6,
 					type = "toggle",
+					name = L["Item Price"],
+					desc = L["Display vendor sell value on item tooltips."],
+					set = function(info, value)
+						E.db.tooltip[info[getn(info)]] = value
+						E:GetModule("Tooltip_ItemPrice"):UpdateSettings()
+					end
+				},
+				spellID = {
+					order = 7,
+					type = "toggle",
 					name = L["Spell/Item IDs"],
 					desc = L["Display the spell or item ID when mousing over a spell or item tooltip."]
 				},
 				itemCount = {
-					order = 7,
+					order = 8,
 					type = "select",
 					name = L["Item Count"],
 					desc = L["Display how many of a certain item you have in your possession."],
@@ -82,14 +92,14 @@ E.Options.args.tooltip = {
 					}
 				},
 				colorAlpha = {
-					order = 8,
+					order = 9,
 					type = "range",
 					name = OPACITY,
 					isPercent = true,
 					min = 0, max = 1, step = 0.01
 				},
 				fontGroup = {
-					order = 8,
+					order = 10,
 					type = "group",
 					guiInline = true,
 					name = L["Tooltip Font Settings"],
@@ -148,7 +158,7 @@ E.Options.args.tooltip = {
 					}
 				},
 				factionColors = {
-					order = 9,
+					order = 11,
 					type = "group",
 					name = L["Custom Faction Colors"],
 					guiInline = true,