Skip to content

Commit 8d7ddad

Browse files
tomrus88tomrus88
committed
WOW-21491patch7.0.3_Beta
1 parent e5fc6d1 commit 8d7ddad

File tree

72 files changed

+3523
-19101
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+3523
-19101
lines changed

‎Interface/AddOns/Blizzard_ChallengesUI/Blizzard_ChallengesUI.lua

Lines changed: 197 additions & 201 deletions
Large diffs are not rendered by default.

‎Interface/AddOns/Blizzard_ChallengesUI/Blizzard_ChallengesUI.xml

Lines changed: 215 additions & 410 deletions
Large diffs are not rendered by default.

‎Interface/AddOns/Blizzard_Collections/Blizzard_Wardrobe.lua

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -283,12 +283,9 @@ function WardrobeTransmogFrame_UpdateApplyButton()
283283
if ( StaticPopup_FindVisible("TRANSMOG_APPLY_WARNING") ) then
284284
canApply = false;
285285
end
286-
MoneyFrame_Update("WardrobeTransmogMoneyFrame", cost, canApply); -- force show 0 copper for undo
287-
if ( canApply ) then
288-
WardrobeTransmogFrame.ApplyButton:Enable();
289-
else
290-
WardrobeTransmogFrame.ApplyButton:Disable();
291-
end
286+
MoneyFrame_Update("WardrobeTransmogMoneyFrame", cost, true); -- always show 0 copper
287+
WardrobeTransmogFrame.ApplyButton:SetEnabled(canApply);
288+
WardrobeTransmogFrame.Model.ClearAllPendingButton:SetShown(canApply);
292289
end
293290

294291
function WardrobeTransmogFrame_GetSlotButton(slotID, transmogType)
@@ -1392,13 +1389,17 @@ function WardrobeCollectionFrameModel_OnMouseDown(self, button)
13921389
else
13931390
local sources = WardrobeCollectionFrame_GetSortedAppearanceSources(self.visualInfo.visualID);
13941391
local offset = WardrobeCollectionFrame.tooltipIndexOffset;
1395-
if ( offset < 0 ) then
1396-
offset = #sources + offset;
1392+
if ( offset ) then
1393+
if ( offset < 0 ) then
1394+
offset = #sources + offset;
1395+
end
1396+
local index = mod(offset, #sources) + 1;
1397+
link = select(6, C_TransmogCollection.GetAppearanceSourceInfo(sources[index].sourceID));
13971398
end
1398-
local index = mod(offset, #sources) + 1;
1399-
link = select(6, C_TransmogCollection.GetAppearanceSourceInfo(sources[index].sourceID));
14001399
end
1401-
HandleModifiedItemClick(link);
1400+
if ( link ) then
1401+
HandleModifiedItemClick(link);
1402+
end
14021403
return;
14031404
elseif ( IsModifiedClick("DRESSUP") ) then
14041405
if ( WardrobeCollectionFrame.transmogType == LE_TRANSMOG_TYPE_APPEARANCE ) then
@@ -1412,16 +1413,16 @@ function WardrobeCollectionFrameModel_OnMouseDown(self, button)
14121413
end
14131414

14141415
if ( button == "LeftButton" ) then
1416+
CloseDropDownMenus();
14151417
WardrobeCollectionFrame_SelectVisual(self.visualInfo.visualID);
1416-
elseif ( button == "RightButton" and self.visualInfo.isCollected and not self.visualInfo.isHideVisual ) then
1417-
if ( WardrobeCollectionFrame.transmogType == LE_TRANSMOG_TYPE_ILLUSION ) then
1418-
-- nothing for enchants
1419-
return;
1420-
end
1418+
elseif ( button == "RightButton" ) then
14211419
local dropDown = WardrobeCollectionFrame.ModelsFrame.RightClickDropDown;
14221420
if ( dropDown.activeFrame ~= self ) then
14231421
CloseDropDownMenus();
14241422
end
1423+
if ( not self.visualInfo.isCollected or self.visualInfo.isHideVisual or WardrobeCollectionFrame.transmogType == LE_TRANSMOG_TYPE_ILLUSION ) then
1424+
return;
1425+
end
14251426
dropDown.activeFrame = self;
14261427
ToggleDropDownMenu(1, nil, dropDown, self, -6, -3);
14271428
PlaySound("igMainMenuOptionCheckBoxOn");
@@ -1547,7 +1548,7 @@ function WardrobeCollectionFrameModel_SetTooltip()
15471548

15481549
if ( sources[headerIndex].sourceType == TRANSMOG_SOURCE_BOSS_DROP and not sources[headerIndex].isCollected ) then
15491550
local drops = C_TransmogCollection.GetAppearanceSourceDrops(headerSourceID);
1550-
if ( drops ) then
1551+
if ( drops and #drops > 0 ) then
15511552
local showDifficulty = false;
15521553
if ( #drops == 1 ) then
15531554
sourceText = _G["TRANSMOG_SOURCE_"..TRANSMOG_SOURCE_BOSS_DROP]..": "..string.format(WARDROBE_TOOLTIP_ENCOUNTER_SOURCE, drops[1].encounter, drops[1].instance);

‎Interface/AddOns/Blizzard_Collections/Blizzard_Wardrobe.xml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1160,6 +1160,33 @@
11601160
</OnLoad>
11611161
</Scripts>
11621162
<Frames>
1163+
<Button parentKey="ClearAllPendingButton" inherits="UIMenuButtonStretchTemplate" hidden="true">
1164+
<Size x="26" y="26"/>
1165+
<Anchors>
1166+
<Anchor point="TOPRIGHT" x="-5" y="-10"/>
1167+
</Anchors>
1168+
<Layers>
1169+
<Layer level="ARTWORK">
1170+
<Texture parentKey="Icon" atlas="transmog-icon-revert-small" useAtlasSize="true">
1171+
<Anchors>
1172+
<Anchor point="CENTER"/>
1173+
</Anchors>
1174+
</Texture>
1175+
</Layer>
1176+
</Layers>
1177+
<HighlightTexture file="Interface\Buttons\UI-Common-MouseHilight" alphaMode="ADD"/>
1178+
<Scripts>
1179+
<OnClick>
1180+
PlaySound("UI_Transmog_RevertingGearSlot");
1181+
C_Transmog.ClearPending();
1182+
</OnClick>
1183+
<OnEnter>
1184+
GameTooltip:SetOwner(self, "ANCHOR_RIGHT");
1185+
GameTooltip:SetText(TRANSMOGRIFY_CLEAR_ALL_PENDING);
1186+
</OnEnter>
1187+
<OnLeave function="GameTooltip_Hide"/>
1188+
</Scripts>
1189+
</Button>
11631190
<Button parentKey="HeadButton" parentArray="SlotButtons" inherits="WardrobeTransmogButtonTemplate">
11641191
<KeyValues>
11651192
<KeyValue key="slot" value="HEADSLOT" type="string"/>

‎Interface/AddOns/Blizzard_EncounterJournal/Blizzard_EncounterJournal.lua

Lines changed: 28 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ local EJ_TIER_DATA =
8484
[4] = { backgroundTexture = "Interface\\EncounterJournal\\UI-EJ-Cataclysm", r = 1.0, g = 0.4, b = 0.0 },
8585
[5] = { backgroundTexture = "Interface\\EncounterJournal\\UI-EJ-MistsofPandaria", r = 0.0, g = 0.6, b = 0.2 },
8686
[6] = { backgroundTexture = "Interface\\ENCOUNTERJOURNAL\\UI-EJ-WarlordsofDraenor", r = 0.82, g = 0.55, b = 0.1 },
87-
[7] = { backgroundTexture = "Interface\\EncounterJournal\\UI-EJ-Classic", r = 1.0, g = 0.8, b = 0.0 },
87+
[7] = { backgroundTexture = "Interface\\EncounterJournal\\UI-EJ-Legion", r = 1.0, g = 0.8, b = 0.0 },
8888
}
8989

9090
ExpansionEnumToEJTierDataTableId = {
@@ -451,7 +451,7 @@ local function EncounterJournal_SearchForOverview(instanceID)
451451
end
452452

453453
function EncounterJournal_DisplayInstance(instanceID, noButton)
454-
EncounterJournal.suggestFrame:Hide();
454+
EJ_HideNonInstancePanels();
455455

456456
local self = EncounterJournal.encounter;
457457
EncounterJournal.instanceSelect:Hide();
@@ -2091,7 +2091,7 @@ end
20912091

20922092

20932093
function EncounterJournal_OpenJournal(difficultyID, instanceID, encounterID, sectionID, creatureID, itemID, tierIndex)
2094-
EJHideSuggestPanel();
2094+
EJ_HideNonInstancePanels();
20952095
ShowUIPanel(EncounterJournal);
20962096
if instanceID then
20972097
NavBar_Reset(EncounterJournal.navBar);
@@ -2216,28 +2216,35 @@ function EJ_ContentTab_Select(id)
22162216
selectedTab.selectedGlow:SetVertexColor(tierData.r, tierData.g, tierData.b);
22172217
selectedTab.selectedGlow:Show();
22182218
instanceSelect.bg:SetTexture(tierData.backgroundTexture);
2219-
2219+
EncounterJournal.encounter:Hide();
2220+
EncounterJournal.instanceSelect:Show();
2221+
22202222
if ( id == instanceSelect.suggestTab.id ) then
2221-
EncounterJournal.encounter:Hide();
2222-
instanceSelect.scroll:Hide();
22232223
EJ_HideInstances();
2224-
EncounterJournal.instanceSelect:Show();
2224+
EJ_HideLootJournalPanel();
2225+
instanceSelect.scroll:Hide();
22252226
EncounterJournal.suggestFrame:Show();
22262227
if ( not instanceSelect.dungeonsTab.grayBox:IsShown() or not instanceSelect.raidsTab.grayBox:IsShown() ) then
22272228
UIDropDownMenu_DisableDropDown(instanceSelect.tierDropDown);
22282229
else
22292230
UIDropDownMenu_EnableDropDown(instanceSelect.tierDropDown);
22302231
end
2232+
elseif ( id == instanceSelect.LootJournalTab.id ) then
2233+
EJ_HideInstances();
2234+
EJ_HideSuggestPanel();
2235+
instanceSelect.scroll:Hide();
2236+
UIDropDownMenu_DisableDropDown(instanceSelect.tierDropDown);
2237+
EncounterJournal.LootJournal:Show();
22312238
elseif ( id == instanceSelect.dungeonsTab.id or id == instanceSelect.raidsTab.id ) then
2232-
EJHideSuggestPanel();
2239+
EJ_HideNonInstancePanels();
22332240
instanceSelect.scroll:Show();
22342241
EncounterJournal_ListInstances();
22352242
UIDropDownMenu_EnableDropDown(instanceSelect.tierDropDown);
22362243
end
22372244
PlaySound("igMainMenuOptionCheckBoxOn");
22382245
end
22392246

2240-
function EJHideSuggestPanel()
2247+
function EJ_HideSuggestPanel()
22412248
local instanceSelect = EncounterJournal.instanceSelect;
22422249
local suggestTab = instanceSelect.suggestTab;
22432250
if ( not suggestTab:IsEnabled() or EncounterJournal.suggestFrame:IsShown() ) then
@@ -2259,6 +2266,18 @@ function EJHideSuggestPanel()
22592266
end
22602267
end
22612268

2269+
function EJ_HideLootJournalPanel()
2270+
-- might not exist yet since its xml gets loaded after EJ
2271+
if ( EncounterJournal.LootJournal ) then
2272+
EncounterJournal.LootJournal:Hide();
2273+
end
2274+
end
2275+
2276+
function EJ_HideNonInstancePanels()
2277+
EJ_HideSuggestPanel();
2278+
EJ_HideLootJournalPanel();
2279+
end
2280+
22622281
function EJTierDropDown_OnLoad(self)
22632282
UIDropDownMenu_Initialize(self, EJTierDropDown_Initialize, "MENU");
22642283
end

‎Interface/AddOns/Blizzard_EncounterJournal/Blizzard_EncounterJournal.toc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@
66
## Version: 1.0
77
## LoadOnDemand: 1
88
Blizzard_EncounterJournal.xml
9+
Blizzard_LootJournal.xml
910
Localization.lua

0 commit comments

Comments
 (0)