WOW-33237patch8.3.0_PTR

Interface/AddOns/Blizzard_APIDocumentation/AuctionHouseDocumentation.lua

@@ -688,6 +688,21 @@ local AuctionHouse =
 				{ Name = "valid", Type = "bool", Nilable = false },
 			},
 		},
+		{
+			Name = "IsThrottledMessageSystemReady",
+			Type = "Function",
+			Documentation = { "This function is not used in the base UI but is included for AddOn ease-of-use." },
+
+			Arguments =
+			{
+				{ Name = "specificSearch", Type = "bool", Nilable = false, Default = false },
+			},
+
+			Returns =
+			{
+				{ Name = "canSendThrottledMessage", Type = "bool", Nilable = false },
+			},
+		},
 		{
 			Name = "MakeItemKey",
 			Type = "Function",
@@ -899,6 +914,21 @@ local AuctionHouse =
 				{ Name = "auctionID", Type = "number", Nilable = false },
 			},
 		},
+		{
+			Name = "AuctionHouseAuctionCreated",
+			Type = "Event",
+			LiteralName = "AUCTION_HOUSE_AUCTION_CREATED",
+			Documentation = { "This signal is not used in the base UI but is included for AddOn ease-of-use." },
+			Payload =
+			{
+				{ Name = "auctionID", Type = "number", Nilable = false },
+			},
+		},
+		{
+			Name = "AuctionHouseBrowseFailure",
+			Type = "Event",
+			LiteralName = "AUCTION_HOUSE_BROWSE_FAILURE",
+		},
 		{
 			Name = "AuctionHouseBrowseResultsAdded",
 			Type = "Event",
@@ -937,6 +967,16 @@ local AuctionHouse =
 				{ Name = "auctionID", Type = "number", Nilable = false },
 			},
 		},
+		{
+			Name = "AuctionHouseNewResultsReceived",
+			Type = "Event",
+			LiteralName = "AUCTION_HOUSE_NEW_RESULTS_RECEIVED",
+			Documentation = { "This signal is not used in the base UI but is included for AddOn ease-of-use. Payload is nil for browse queries." },
+			Payload =
+			{
+				{ Name = "itemKey", Type = "ItemKey", Nilable = true },
+			},
+		},
 		{
 			Name = "AuctionHouseScriptDeprecated",
 			Type = "Event",
@@ -947,6 +987,42 @@ local AuctionHouse =
 			Type = "Event",
 			LiteralName = "AUCTION_HOUSE_SHOW",
 		},
+		{
+			Name = "AuctionHouseThrottledMessageDropped",
+			Type = "Event",
+			LiteralName = "AUCTION_HOUSE_THROTTLED_MESSAGE_DROPPED",
+			Documentation = { "This signal is not used in the base UI but is included for AddOn ease-of-use." },
+		},
+		{
+			Name = "AuctionHouseThrottledMessageQueued",
+			Type = "Event",
+			LiteralName = "AUCTION_HOUSE_THROTTLED_MESSAGE_QUEUED",
+			Documentation = { "This signal is not used in the base UI but is included for AddOn ease-of-use." },
+		},
+		{
+			Name = "AuctionHouseThrottledMessageResponseReceived",
+			Type = "Event",
+			LiteralName = "AUCTION_HOUSE_THROTTLED_MESSAGE_RESPONSE_RECEIVED",
+			Documentation = { "This signal is not used in the base UI but is included for AddOn ease-of-use." },
+		},
+		{
+			Name = "AuctionHouseThrottledMessageSent",
+			Type = "Event",
+			LiteralName = "AUCTION_HOUSE_THROTTLED_MESSAGE_SENT",
+			Documentation = { "This signal is not used in the base UI but is included for AddOn ease-of-use." },
+		},
+		{
+			Name = "AuctionHouseThrottledSpecificSearchReady",
+			Type = "Event",
+			LiteralName = "AUCTION_HOUSE_THROTTLED_SPECIFIC_SEARCH_READY",
+			Documentation = { "This signal is not used in the base UI but is included for AddOn ease-of-use." },
+		},
+		{
+			Name = "AuctionHouseThrottledSystemReady",
+			Type = "Event",
+			LiteralName = "AUCTION_HOUSE_THROTTLED_SYSTEM_READY",
+			Documentation = { "This signal is not used in the base UI but is included for AddOn ease-of-use." },
+		},
 		{
 			Name = "AuctionMultisellFailure",
 			Type = "Event",

Interface/AddOns/Blizzard_AuctionHouseUI/Blizzard_AuctionHouseAuctionsFrame.lua

@@ -182,7 +182,7 @@ function AuctionHouseAuctionsFrameMixin:OnShow()
 	-- AllBids and AllAuctions will update the entire list. Other views require
 	-- and explicit update.
 	local displayMode = self:GetDisplayMode();
-	if displayMode ~= AuctionsFrameDisplayMode.AllBids and displayMode ~= AuctionsFrameDisplayMode.AllAuctions then
+	if displayMode ~= AuctionsFrameDisplayMode.BidsList and displayMode ~= AuctionsFrameDisplayMode.AllAuctions then
 		self:RefreshSeachResults();
 	end
 end
@@ -539,7 +539,6 @@ function AuctionHouseAuctionsFrameMixin:SetTab(tabID)
 	self.BuyoutFrame:SetShown(isDisplayingBids);
 
 	if isDisplayingBids then
-		self:GetAuctionHouseFrame():QueryAll(AuctionHouseSearchContext.AllBids);
 		self:SetDisplayMode(AuctionsFrameDisplayMode.BidsList);
 
 		local function GetNumBidSummaryResults()
@@ -548,7 +547,6 @@ function AuctionHouseAuctionsFrameMixin:SetTab(tabID)
 
 		self.SummaryList:SetGetNumResultsFunction(GetNumBidSummaryResults);
 	else
-		self:GetAuctionHouseFrame():QueryAll(AuctionHouseSearchContext.AllAuctions);
 		self:SetDisplayMode(AuctionsFrameDisplayMode.AllAuctions);
 		
 		local function GetNumOwnedAuctionSummaryResults()

Interface/AddOns/Blizzard_AuctionHouseUI/Blizzard_AuctionHouseCommoditiesSellFrame.lua

@@ -81,6 +81,10 @@ function AuctionHouseCommoditiesSellFrameMixin:GetDepositAmount()
 	return deposit;
 end
 
+function AuctionHouseCommoditiesSellFrameMixin:GetTotalPrice()
+	return self:GetQuantity() * self:GetUnitPrice();
+end
+
 function AuctionHouseCommoditiesSellFrameMixin:CanPostItem()
 	local canPostItem, reasonTooltip = AuctionHouseSellFrameMixin.CanPostItem(self);
 	if not canPostItem then

Interface/AddOns/Blizzard_AuctionHouseUI/Blizzard_AuctionHouseFrame.lua

@@ -67,7 +67,7 @@ AUCTION_HOUSE_STATIC_POPUPS = {
 };
 
 
-local AuctionHouseSortVersion = 1;
+local AuctionHouseSortVersion = 2;
 local MaxNumAuctionHouseSortTypes = 2;
 
 AuctionHouseSortOrderState = tInvert({
@@ -80,6 +80,16 @@ AuctionHouseSortOrderState = tInvert({
 
 
 local function InitAuctionHouseSortsBySearchContext()
+	-- [[ Transition between compatible sort versions. ]]
+	if g_auctionHouseSortsBySearchContext and g_auctionHouseSortsBySearchContext.auctionHouseSortVersion == 1 then
+		g_auctionHouseSortsBySearchContext[AuctionHouseSearchContext.AllAuctions][1] = { sortOrder = Enum.AuctionHouseSortOrder.Name, reverseSort = false };
+		g_auctionHouseSortsBySearchContext[AuctionHouseSearchContext.AllAuctions][2] = { sortOrder = Enum.AuctionHouseSortOrder.Price, reverseSort = false };
+		g_auctionHouseSortsBySearchContext[AuctionHouseSearchContext.AllBids][1] = { sortOrder = Enum.AuctionHouseSortOrder.Name, reverseSort = false };
+		g_auctionHouseSortsBySearchContext[AuctionHouseSearchContext.AllBids][2] = { sortOrder = Enum.AuctionHouseSortOrder.Price, reverseSort = false };
+	end
+
+
+	-- If the sort version couldn't be updated, do a clean reset.
 	if g_auctionHouseSortsBySearchContext == nil or g_auctionHouseSortsBySearchContext.auctionHouseSortVersion ~= AuctionHouseSortVersion then
 		g_auctionHouseSortsBySearchContext = { auctionHouseSortVersion = AuctionHouseSortVersion };
 
@@ -105,6 +115,9 @@ local function InitAuctionHouseSortsBySearchContext()
 			[AuctionHouseSearchContext.SellItems] = true,
 			[AuctionHouseSearchContext.AuctionsItems] = true,
 			[AuctionHouseSearchContext.BidItems] = true,
+		};
+
+		local ownedContexts = {
 			[AuctionHouseSearchContext.AllAuctions] = true,
 			[AuctionHouseSearchContext.AllBids] = true,
 		};
@@ -118,6 +131,9 @@ local function InitAuctionHouseSortsBySearchContext()
 			elseif itemContexts[searchContext] then
 				g_auctionHouseSortsBySearchContext[searchContext][1] = { sortOrder = Enum.AuctionHouseSortOrder.Buyout, reverseSort = false };
 				g_auctionHouseSortsBySearchContext[searchContext][2] = { sortOrder = Enum.AuctionHouseSortOrder.Bid, reverseSort = false };
+			elseif ownedContexts[searchContext] then
+				g_auctionHouseSortsBySearchContext[searchContext][1] = { sortOrder = Enum.AuctionHouseSortOrder.Name, reverseSort = false };
+				g_auctionHouseSortsBySearchContext[searchContext][2] = { sortOrder = Enum.AuctionHouseSortOrder.Price, reverseSort = false };
 			end
 		end
 		
@@ -498,7 +514,7 @@ function AuctionHouseFrameMixin:IsListingAuctions()
 end
 
 function AuctionHouseFrameMixin:SetPostItem(itemLocation)
-	if not itemLocation:IsValid() or not C_AuctionHouse.IsSellItemValid(itemLocation) then
+	if not itemLocation:IsValid() or not C_AuctionHouse.IsSellItemValid(itemLocation) or AuctionHouseMultisellProgressFrame:IsShown() then
 		return;
 	end
 
@@ -734,7 +750,8 @@ function AuctionHouseFrameMixin:StartItemBuyout(auctionID, buyout)
 end
 
 function AuctionHouseFrameMixin:SetSearchText(text)
-	if self.displayMode == AuctionHouseFrameDisplayMode.Buy then
+	if self.displayMode == AuctionHouseFrameDisplayMode.Buy or self.displayMode == AuctionHouseFrameDisplayMode.ItemBuy or
+		self.displayMode == AuctionHouseFrameDisplayMode.WoWTokenBuy or self.displayMode == AuctionHouseFrameDisplayMode.CommoditiesBuy then
 		self.SearchBar:SetSearchText(text);
 		return true;
 	end

Interface/AddOns/Blizzard_AuctionHouseUI/Blizzard_AuctionHouseItemSellFrame.lua

@@ -73,6 +73,12 @@ function AuctionHouseItemSellFrameMixin:OnHide()
 	AuctionHouseSellFrameMixin.OnHide(self);
 
 	FrameUtil.UnregisterFrameForEvents(self, AUCTION_HOUSE_ITEM_SELL_FRAME_EVENTS);
+
+	if AuctionHouseMultisellProgressFrame:IsShown() then
+		-- Clear out any active multisell.
+		C_AuctionHouse.CancelSell();
+		self:SetMultiSell(false);
+	end
 end
 
 function AuctionHouseItemSellFrameMixin:OnEvent(event, ...)
@@ -209,6 +215,10 @@ function AuctionHouseItemSellFrameMixin:SetSecondaryPriceInputEnabled(enabled)
 end
 
 function AuctionHouseItemSellFrameMixin:SetItem(itemLocation, fromItemDisplay, refreshListWithPreviousItem)
+	if self.DisabledOverlay:IsShown() then
+		return;
+	end
+
 	AuctionHouseSellFrameMixin.SetItem(self, itemLocation, fromItemDisplay);
 
 	self.SecondaryPriceInput:Clear();
@@ -293,6 +303,11 @@ function AuctionHouseItemSellFrameMixin:GetDepositAmount()
 	return deposit;
 end
 
+function AuctionHouseItemSellFrameMixin:GetTotalPrice()
+	local bidPrice, buyoutPrice = self:GetPrice();
+	return self:GetQuantity() * (buyoutPrice or bidPrice or 0);
+end
+
 function AuctionHouseItemSellFrameMixin:GetPrice()
 	local buyoutPrice = self.PriceInput:GetAmount();
 	local bidPrice = self.SecondaryPriceInput:IsShown() and self.SecondaryPriceInput:GetAmount() or nil;

Interface/AddOns/Blizzard_AuctionHouseUI/Blizzard_AuctionHouseSellFrame.lua

@@ -347,6 +347,7 @@ end
 
 function AuctionHouseSellFrameMixin:UpdatePostState()
 	self:UpdateDeposit();
+	self:UpdateTotalPrice();
 	self:UpdatePostButtonState();
 	
 	local quantity = self.QuantityInput:GetQuantity();
@@ -498,6 +499,10 @@ function AuctionHouseSellFrameMixin:UpdateDeposit()
 	self.Deposit:SetAmount(depositCost);
 end
 
+function AuctionHouseSellFrameMixin:UpdateTotalPrice()
+	self.TotalPrice:SetAmount(self:GetTotalPrice());
+end
+
 function AuctionHouseSellFrameMixin:ShowHelpTip()
 	local helpTipInfo = {
 		text = AUCTION_HOUSE_UNDERCUT_TUTORIAL,
@@ -519,6 +524,10 @@ function AuctionHouseSellFrameMixin:GetDepositAmount()
 	-- Implement in your derived mixin.
 end
 
+function AuctionHouseSellFrameMixin:GetTotalPrice()
+	-- Implement in your derived mixin.
+end
+
 function AuctionHouseSellFrameMixin:PostItem()
 	-- Implement in your derived mixin.
 end

Interface/AddOns/Blizzard_AuctionHouseUI/Blizzard_AuctionHouseSellFrame.xml

@@ -247,9 +247,15 @@
 					<KeyValue key="labelText" value="AUCTION_HOUSE_DEPOSIT_LABEL" type="global"/>
 				</KeyValues>
 			</Frame>
-			<Button parentKey="PostButton" motionScriptsWhileDisabled="true" mixin="AuctionHouseSellFramePostButtonMixin" inherits="UIPanelButtonTemplate" text="AUCTION_HOUSE_POST_BUTTON" frameLevel="350">
+			<Frame parentKey="TotalPrice" inherits="AuctionHouseAlignedPriceDisplayTemplate">
 				<KeyValues>
 					<KeyValue key="layoutIndex" value="60" type="number"/>
+					<KeyValue key="labelText" value="AUCTION_HOUSE_TOTAL_PRICE_LABEL" type="global"/>
+				</KeyValues>
+			</Frame>
+			<Button parentKey="PostButton" motionScriptsWhileDisabled="true" mixin="AuctionHouseSellFramePostButtonMixin" inherits="UIPanelButtonTemplate" text="AUCTION_HOUSE_POST_BUTTON" frameLevel="350">
+				<KeyValues>
+					<KeyValue key="layoutIndex" value="70" type="number"/>
 					<KeyValue key="leftPadding" value="74" type="number"/>
 				</KeyValues>
 				<Size x="194" y="22"/>

Interface/AddOns/Blizzard_AuctionHouseUI/Blizzard_AuctionHouseUtil.lua

@@ -296,9 +296,11 @@ function AuctionHouseUtil.AddSellersToTooltip(tooltip, sellers)
 		end
 		sellersString = sellersString..FONT_COLOR_CODE_CLOSE;
 
-		tooltip:AddLine(AUCTION_HOUSE_TOOLTIP_MULTIPLE_SELLERS_FORMAT:format(sellersString));
+		local wrap = true;
+		GameTooltip_AddNormalLine(tooltip, AUCTION_HOUSE_TOOLTIP_MULTIPLE_SELLERS_FORMAT:format(sellersString), wrap);
 	elseif numSellers > 0 then
-		tooltip:AddLine(AUCTION_HOUSE_TOOLTIP_SELLER_FORMAT:format(sellersString));
+		local wrap = true;
+		GameTooltip_AddNormalLine(tooltip, AUCTION_HOUSE_TOOLTIP_SELLER_FORMAT:format(sellersString), wrap);
 	end
 end
 
@@ -436,8 +438,9 @@ function AuctionHouseUtil.ConvertItemSellItemKey(itemKey)
 
 	local itemKeyInfo = C_AuctionHouse.GetItemKeyInfo(itemKey);
 	if itemKeyInfo and itemKeyInfo.isEquipment then
-		-- Item keys for equipment you're selling have no item level so you can compare to similar items that have a different item level.
+		-- Item keys for equipment you're selling have no item level or suffix so you can compare to similar items.
 		itemKey.itemLevel = 0;
+		itemKey.itemSuffix = 0;
 		return itemKey;
 	end
 

Interface/FrameXML/FloatingPetBattleTooltip.lua

@@ -123,8 +123,11 @@ function BattlePetTooltipTemplate_SetBattlePet(tooltipFrame, data)
 	tooltipFrame.textLineAnchor = nil;
 end
 
-function BattlePetTooltipTemplate_AddTextLine(self, text, color)
-	color = color or NORMAL_FONT_COLOR;
+-- [[ does not support wrapping ]]
+function BattlePetTooltipTemplate_AddTextLine(self, text, r, g, b)
+	if not r then
+		r, g, b = NORMAL_FONT_COLOR:GetRGB();
+	end
 	
 	local anchor = self.textLineAnchor;
 	if not anchor then
@@ -139,7 +142,7 @@ function BattlePetTooltipTemplate_AddTextLine(self, text, color)
 
 	local line = self.linePool:Acquire();
 	line:SetText(text);
-	line:SetTextColor(color:GetRGB());
+	line:SetTextColor(r, g, b);
 	line:SetPoint("TOP", anchor, "BOTTOM", 0, -2);
 	line:SetPoint("LEFT", self.Name, "LEFT");
 	line:Show();

Interface/FrameXML/UIParent.lua

@@ -1151,6 +1151,15 @@ local function HandlesGlobalMouseEvent(focus, buttonID, event)
 	return focus and focus.HandlesGlobalMouseEvent and focus:HandlesGlobalMouseEvent(buttonID, event);
 end
 
+local function HasVisibleAutoCompleteBox(autoCompleteBoxList, mouseFocus)
+	for i, box in ipairs(autoCompleteBoxList) do
+		if box:IsShown() and DoesAncestryInclude(box, mouseFocus) then
+			return true;
+		end
+	end
+	return false;
+end
+
 -- UIParent_OnEvent --
 function UIParent_OnEvent(self, event, ...)
 	local arg1, arg2, arg3, arg4, arg5, arg6 = ...;
@@ -2193,8 +2202,12 @@ function UIParent_OnEvent(self, event, ...)
 		end
 
 		-- Clear keyboard focus.
-		local autoCompleteShown = AutoCompleteBox and AutoCompleteBox:IsShown();
-		if not autoCompleteShown or not DoesAncestryInclude(AutoCompleteBox, mouseFocus) then
+		local autoCompleteBoxList = { AutoCompleteBox }
+		if LFGListFrame and LFGListFrame.SearchPanel and LFGListFrame.SearchPanel.AutoCompleteFrame then 
+			tinsert(autoCompleteBoxList, LFGListFrame.SearchPanel.AutoCompleteFrame);
+		end
+
+		if not HasVisibleAutoCompleteBox(autoCompleteBoxList, mouseFocus) then
 			if event == "GLOBAL_MOUSE_DOWN" and buttonID == "LeftButton" and not IsModifierKeyDown() then
 				local keyBoardFocus = GetCurrentKeyBoardFocus();
 				if keyBoardFocus then
@@ -2277,7 +2290,7 @@ function UIParent_UpdateTopFramePositions()
 end
 
 UIPARENT_ALTERNATE_FRAME_POSITIONS = {
-	["PlayerPowerBarAlt_Bottom"] = {baseY = true, yOffset = 40, bottomEither = actionBarOffset, overrideActionBar = overrideActionBarTop, petBattleFrame = petBattleTop, bonusActionBar = 1, pet = 1, reputation = 1, tutorialAlert = 1, extraActionBarFrame = 1, ZoneAbilityFrame = 1};
+	["PlayerPowerBarAlt_Bottom"] = {baseY = true, yOffset = 20, bottomEither = actionBarOffset, overrideActionBar = overrideActionBarTop, petBattleFrame = petBattleTop, bonusActionBar = 1, pet = 1, reputation = 1, tutorialAlert = 1, extraActionBarFrame = 1, ZoneAbilityFrame = 1};
 	["PlayerPowerBarAlt_Top"] = {baseY = -30, anchorTo = "UIParent", point = "TOP", rpoint = "TOP"};
 }
 
@@ -2291,11 +2304,11 @@ UIPARENT_MANAGED_FRAME_POSITIONS = {
 	["FramerateLabel"] = {baseY = true, bottomEither = actionBarOffset, overrideActionBar = overrideActionBarTop, petBattleFrame = petBattleTop, bonusActionBar = 1, pet = 1, watchBar = 1, playerPowerBarAlt = 1, powerBarWidgets = 1, extraActionBarFrame = 1, anchorTo="WorldFrame" };
 	["ArcheologyDigsiteProgressBar"] = {baseY = true, yOffset = 40, bottomEither = actionBarOffset, overrideActionBar = overrideActionBarTop, petBattleFrame = petBattleTop, bonusActionBar = 1, pet = 1, watchBar = 1, tutorialAlert = 1, playerPowerBarAlt = 1, powerBarWidgets = 1, extraActionBarFrame = 1, ZoneAbilityFrame = 1, castingBar = 1};
 	["CastingBarFrame"] = {baseY = true, yOffset = 40, bottomEither = actionBarOffset, overrideActionBar = overrideActionBarTop, petBattleFrame = petBattleTop, bonusActionBar = 1, pet = 1, watchBar = 1, tutorialAlert = 1, playerPowerBarAlt = 1, powerBarWidgets = 1, extraActionBarFrame = 1, ZoneAbilityFrame = 1, talkingHeadFrame = 1, classResourceOverlayFrame = 1, classResourceOverlayOffset = 1};
-	["UIWidgetPowerBarContainerFrame"] = {baseY = true, yOffset = 40, bottomEither = actionBarOffset, overrideActionBar = overrideActionBarTop, petBattleFrame = petBattleTop, bonusActionBar = 1, pet = 1, watchBar = 1, tutorialAlert = 1, playerPowerBarAlt = 1, extraActionBarFrame = 1, ZoneAbilityFrame = 1, talkingHeadFrame = 1, classResourceOverlayFrame = 1, classResourceOverlayOffset = 1};
+	["UIWidgetPowerBarContainerFrame"] = {baseY = true, yOffset = 20, bottomEither = actionBarOffset, overrideActionBar = overrideActionBarTop, petBattleFrame = petBattleTop, bonusActionBar = 1, pet = 1, watchBar = 1, tutorialAlert = 1, playerPowerBarAlt = 1, extraActionBarFrame = 1, ZoneAbilityFrame = 1, talkingHeadFrame = 1, classResourceOverlayFrame = 1, classResourceOverlayOffset = 1};
 	["ClassResourceOverlayParentFrame"] = {baseY = true, yOffset = 0, bottomEither = actionBarOffset, overrideActionBar = overrideActionBarTop, petBattleFrame = petBattleTop, bonusActionBar = 1, pet = 1, watchBar = 1, tutorialAlert = 1, playerPowerBarAlt = 1, powerBarWidgets = 1, extraActionBarFrame = 1, ZoneAbilityFrame = 1 };
 	["PlayerPowerBarAlt"] = UIPARENT_ALTERNATE_FRAME_POSITIONS["PlayerPowerBarAlt_Bottom"];
 	["ExtraActionBarFrame"] = {baseY = true, yOffset = 0, bottomEither = actionBarOffset, overrideActionBar = overrideActionBarTop, petBattleFrame = petBattleTop, bonusActionBar = 1, pet = 1, watchBar = 1, tutorialAlert = 1};
-	["ZoneAbilityFrame"] = {baseY = true, yOffset = 100, bottomEither = actionBarOffset, overrideActionBar = overrideActionBarTop, petBattleFrame = petBattleTop, bonusActionBar = 1, pet = 1, watchBar = 1, tutorialAlert = 1, extraActionBarFrame = 1};
+	["ZoneAbilityFrame"] = {baseY = true, yOffset = 0, bottomEither = actionBarOffset, overrideActionBar = overrideActionBarTop, petBattleFrame = petBattleTop, bonusActionBar = 1, pet = 1, watchBar = 1, tutorialAlert = 1, extraActionBarFrame = 1};
 	["ChatFrame1"] = {baseY = true, yOffset = 40, bottomLeft = actionBarOffset-8, justBottomRightAndStance = actionBarOffset, overrideActionBar = overrideActionBarTop, petBattleFrame = petBattleTop, bonusActionBar = 1, pet = 1, watchBar = 1, maxLevel = 1, point = "BOTTOMLEFT", rpoint = "BOTTOMLEFT", xOffset = 32};
 	["ChatFrame2"] = {baseY = true, yOffset = 40, bottomRight = actionBarOffset-8, overrideActionBar = overrideActionBarTop, petBattleFrame = petBattleTop, bonusActionBar = 1, rightLeft = -2*actionBarOffset, rightRight = -actionBarOffset, watchBar = 1, maxLevel = 1, point = "BOTTOMRIGHT", rpoint = "BOTTOMRIGHT", xOffset = -32};
 	["StanceBarFrame"] = {baseY = 0, bottomLeft = actionBarOffset, watchBar = 1, maxLevel = 1, anchorTo = "MainMenuBar", point = "BOTTOMLEFT", rpoint = "TOPLEFT", xOffset = 30};
@@ -3032,7 +3045,7 @@ function FramePositionDelegate:UIParentManageFramePositions()
 			value.extraActionBarFrame = ExtraActionBarFrame:GetHeight() + 10;
 		end
 		if ( value.ZoneAbilityFrame and ZoneAbilityFrame ) then
-			value.ZoneAbilityFrame = ZoneAbilityFrame:GetHeight() + 90;
+			value.ZoneAbilityFrame = ZoneAbilityFrame:GetHeight() + 10;
 		end
 
 		if ( value.bonusActionBar and BonusActionBarFrame ) then

Interface/FrameXML/ZoneAbility.lua

@@ -43,17 +43,12 @@ function ZoneAbilityFrame_OnEvent(self, event, ...)
 		end
 	end
 
-	if (not self.spellID) then
-		self:Hide();
-		return;
-	end
-
 	self.SpellButton.baseSpellID = self.baseSpellID;
 	self.SpellButton.spellID = self.spellID;
 	local lastState = self.buffSeen;
 	self.buffSeen = false;
 
-	if (self.spellID ~= 0) then
+	if self.spellID and self.spellID ~= 0 then
 		if (not HasZoneAbilitySpellOnBar(self)) then
 			if ( not GetCVarBitfield("closedInfoFrames", LE_FRAME_TUTORIAL_GARRISON_ZONE_ABILITY) and type == Enum.ZoneAbilityType.Garrison ) then
 				ZoneAbilityButtonAlert:SetHeight(ZoneAbilityButtonAlert.Text:GetHeight()+42);
@@ -69,9 +64,6 @@ function ZoneAbilityFrame_OnEvent(self, event, ...)
 
 		ZoneAbilityFrame_Update(self);
 	else
-		if (not self.CurrentTexture) then
-			self.CurrentTexture = select(3, GetSpellInfo(self.spellID));
-		end
 		self:Hide();
 	end
 

Interface/GlueXML/CharacterCreate.lua

@@ -1184,8 +1184,12 @@ function CharacterCreate_Finish()
 			KioskModeSplash_SetAutoEnterWorld(true);
 		end
 
-		if CharacterUpgrade_IsCreatedCharacterTrialBoost() then
+		local classInfo = C_CharacterCreation.GetSelectedClass();
+		local isPandaDK = (C_CharacterCreation.GetSelectedRace() == PANDAREN_RACE_ID ) and (classInfo.classID == DEATH_KNIGHT_CLASS_ID);
+
+		if CharacterUpgrade_IsCreatedCharacterTrialBoost() and not isPandaDK then
 			-- For trial boosts we need to pass up nil for the faction here. We send the faction up separately when the boost is applied
+			-- Pandaren Death Knights are the exception...they need to pass up a faction because there is no such thing as a neutral Panda DK
 			C_CharacterCreation.CreateCharacter(CharacterCreateNameEdit:GetText());
 		else
 			C_CharacterCreation.CreateCharacter(CharacterCreateNameEdit:GetText(), CharacterCreate_GetSelectedFactionName());

Interface/SharedXML/GraphicsQualityLevels.lua

@@ -457,7 +457,7 @@ VideoData["Graphics_ParticleDensityDropDown"]={
 	graphicsCVar =	"graphicsParticleDensity",
 	data = {
 		[1] = {
-			text = VIDEO_OPTIONS_LOW,
+			text = IsMacClient() and VIDEO_OPTIONS_DISABLED or VIDEO_OPTIONS_LOW,
 		},
 		[2] = {
 			text = VIDEO_OPTIONS_FAIR,
@@ -483,7 +483,7 @@ VideoData["RaidGraphics_ParticleDensityDropDown"]={
 	graphicsCVar =	"raidGraphicsParticleDensity",
 	data = {
 		[1] = {
-			text = VIDEO_OPTIONS_LOW,
+			text = IsMacClient() and VIDEO_OPTIONS_DISABLED or VIDEO_OPTIONS_LOW,
 		},
 		[2] = {
 			text = VIDEO_OPTIONS_FAIR,