Commit cc115737 authored by TOM_RUS's avatar TOM_RUS

WOW-32976patch8.3.0_PTR

parent d0a4cba6
......@@ -9,6 +9,7 @@ AuctionHouseBrowseResultsFrameMixin = CreateFromMixins(AuctionHouseSortOrderSyst
local AUCTION_HOUSE_BROWSE_RESULTS_FRAME_EVENTS = {
"AUCTION_HOUSE_BROWSE_RESULTS_UPDATED",
"AUCTION_HOUSE_BROWSE_RESULTS_ADDED",
"AUCTION_HOUSE_BROWSE_FAILURE",
};
function AuctionHouseBrowseResultsFrameMixin:SetupTableBuilder(extraInfoColumn)
......@@ -87,6 +88,8 @@ function AuctionHouseBrowseResultsFrameMixin:OnEvent(event, ...)
elseif event == "AUCTION_HOUSE_BROWSE_RESULTS_ADDED" then
local addedBrowseResults = ...;
self:UpdateBrowseResults(addedBrowseResults);
elseif event == "AUCTION_HOUSE_BROWSE_FAILURE" then
self.ItemList:SetCustomError(RED_FONT_COLOR:WrapTextInColorCode(ERR_AUCTION_DATABASE_ERROR));
end
end
......
......@@ -122,6 +122,12 @@ function AuctionHouseItemListMixin:SetLineTemplate(lineTemplate, ...)
self.initArgs = { ... };
end
function AuctionHouseItemListMixin:SetCustomError(errorText)
self:SetState(ItemListState.NoResults);
self.ResultsText:Show();
self.ResultsText:SetText(errorText);
end
function AuctionHouseItemListMixin:Init()
if self.isInitialized then
return;
......
......@@ -142,6 +142,11 @@ function ToySpellButton_OnEnter(self)
self.UpdateTooltip = nil;
end
local hasFanfare = ToyBox.fanfareToys[self.itemID] ~= nil;
local isNew = ToyBox.newToys[self.itemID] ~= nil;
if( isNew and not hasFanfare ) then
ToyBox.newToys[self.itemID] = nil;
end
ToySpellButton_UpdateButton(self);
end
......
......@@ -609,8 +609,10 @@
<Scripts>
<OnMouseDown>
UIMenuButtonStretchMixin.OnMouseDown(self, button);
PlaySound(SOUNDKIT.IG_MAINMENU_OPTION_CHECKBOX_ON);
ToggleDropDownMenu(1, nil, WardrobeFilterDropDown, self, 74, 15);
if self:IsEnabled() then
PlaySound(SOUNDKIT.IG_MAINMENU_OPTION_CHECKBOX_ON);
ToggleDropDownMenu(1, nil, WardrobeFilterDropDown, self, 74, 15);
end
</OnMouseDown>
<OnEnable>
self.Icon:SetDesaturated(false);
......
......@@ -2845,7 +2845,7 @@ end
function LFGListUtil_FilterSearchResults(results, filteredIDs)
for i, id in ipairs(filteredIDs) do
for j = #results, 1, -1 do
if ( results[i] == id ) then
if ( results[j] == id ) then
tremove(results, j);
break;
end
......
......@@ -1735,8 +1735,13 @@ function UIParent_OnEvent(self, event, ...)
--Events for handling Auction UI
elseif ( event == "AUCTION_HOUSE_SHOW" ) then
AuctionHouseFrame_LoadUI();
ShowUIPanel(AuctionHouseFrame);
if ( GameLimitedMode_IsActive() ) then
UIErrorsFrame:AddExternalErrorMessage(ERR_FEATURE_RESTRICTED_TRIAL);
C_AuctionHouse.CloseAuctionHouse();
else
AuctionHouseFrame_LoadUI();
ShowUIPanel(AuctionHouseFrame);
end
elseif ( event == "AUCTION_HOUSE_CLOSED" ) then
if ( AuctionHouseFrame ) then
HideUIPanel(AuctionHouseFrame);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment