Build 17205

AddOns/Blizzard_ArchaeologyUI/Blizzard_ArchaeologyProgressBar.xml

@@ -24,7 +24,7 @@
 			<Alpha startDelay="1.3" change="-1" duration="0.2" order="1"/>
 			<Scripts>
 				<OnFinished>
-					DigSiteToastFrame_ShowAlert(self:GetParent().researchFieldID);
+					DigsiteCompleteToastFrame_ShowAlert(self:GetParent().researchFieldID);
 					self:GetParent():Hide();
 				</OnFinished>
 			</Scripts>
@@ -59,7 +59,7 @@
 					<Anchor point="CENTER"/>
 				</Anchors>
 			</Texture>
-			<FontString parentKey="BarTitle" inherits="GameFontWhiteSmall" text="Digsite Progress">
+			<FontString parentKey="BarTitle" inherits="GameFontWhiteSmall" text="ARCHAEOLOGY_DIGSITE_PROGRESS_BAR_TITLE">
 				<Anchors>
 					<Anchor point="CENTER" x="0" y="12"/>
 				</Anchors>

AddOns/Blizzard_ArenaUI/Blizzard_ArenaUI.lua

@@ -159,6 +159,7 @@ function ArenaEnemyFrame_UpdatePlayer(self, useCVars)--At some points, we need t
 		self.specBorder:Show();
 		SetPortraitToTexture(self.specPortrait, specIcon);
 	else
+		self.specPortrait:SetTexture(nil);
 		self.specBorder:Hide();
 	end
 

AddOns/Blizzard_Calendar/Blizzard_Calendar.lua

@@ -2056,7 +2056,6 @@ function CalendarContextMenu_OnHide(self)
 	CalendarDayContextMenu_UnlockHighlights();
 	CalendarInviteContextMenu_UnlockHighlights();
 	-- fail safe: always hide nested menus
-	CalendarArenaTeamContextMenu:Hide();
 	CalendarInviteStatusContextMenu:Hide();
 end
 
@@ -2097,12 +2096,7 @@ function CalendarDayContextMenu_Initialize(self, flags, dayButton, eventButton)
 			UIMenu_AddButton(self, CALENDAR_CREATE_GUILD_EVENT, nil, CalendarDayContextMenu_CreateGuildEvent);
 			UIMenu_AddButton(self, CALENDAR_CREATE_GUILD_ANNOUNCEMENT, nil, CalendarDayContextMenu_CreateGuildAnnouncement);
 		end
---[[
-		-- add arena team selection if the player has an arena team
-		if ( IsInArenaTeam() ) then
-			--UIMenu_AddButton(self, CALENDAR_CREATE_ARENATEAM_EVENT, nil, nil, "CalendarArenaTeamContextMenu");
-		end
---]]
+
 		needSpacer = true;
 	end
 
@@ -2335,59 +2329,6 @@ function CalendarDayContextMenu_SignUp()
 	CalendarContextEventSignUp();
 end
 
-function CalendarArenaTeamContextMenu_OnLoad(self)
-	self:SetBackdropBorderColor(TOOLTIP_DEFAULT_COLOR.r, TOOLTIP_DEFAULT_COLOR.g, TOOLTIP_DEFAULT_COLOR.b);
-	self:SetBackdropColor(TOOLTIP_DEFAULT_BACKGROUND_COLOR.r, TOOLTIP_DEFAULT_BACKGROUND_COLOR.g, TOOLTIP_DEFAULT_BACKGROUND_COLOR.b);
-	-- get updated arena team info for the context menu
-	self:RegisterEvent("ARENA_TEAM_ROSTER_UPDATE");
-	for i = 1, MAX_ARENA_TEAMS do
-		ArenaTeamRoster(i);
-	end
-	self.parentMenu = "CalendarContextMenu";
-	self.onlyAutoHideSelf = true;
-end
-
-function CalendarArenaTeamContextMenu_OnShow(self)
-	CalendarArenaTeamContextMenu_Initialize(self);
-end
-
-function CalendarArenaTeamContextMenu_OnEvent(self, event, ...)
-	if ( event == "ARENA_TEAM_ROSTER_UPDATE" ) then
-		CalendarArenaTeamContextMenu_Initialize(self);
-	end
-end
-
-function CalendarArenaTeamContextMenu_Initialize(self)
-	UIMenu_Initialize(self);
-	local teamName, teamSize;
-	for i = 1, MAX_ARENA_TEAMS do
-		teamName, teamSize = GetArenaTeam(i);
-		if ( teamName ) then
-			UIMenu_AddButton(
-				CalendarArenaTeamContextMenu,								-- menu
-				format(PVP_TEAMSIZE, teamSize, teamSize),					-- text
-				nil,														-- shortcut
-				CalendarArenaTeamContextMenuButton_OnClick_CreateArenaTeamEvent,	-- func
-				nil,														-- nested
-				i);															-- value
-		end
-	end
-	return UIMenu_FinishInitializing(self);
-end
-
-function CalendarArenaTeamContextMenuButton_OnClick_CreateArenaTeamEvent(self)
-	-- hide parent menu
-	CalendarContextMenu_Hide(CalendarDayContextMenu_Initialize);
-	CalendarCloseEvent();
-	CalendarFrame_HideEventFrame();
-	CalendarDayButton_Click(CalendarContextMenu.dayButton)
-
-	CalendarNewArenaTeamEvent(self.value);
-	CalendarCreateEventFrame.mode = "create";
-	CalendarCreateEventFrame.dayButton = CalendarContextMenu.dayButton;
-	CalendarFrame_ShowEventFrame(CalendarCreateEventFrame);
-end
-
 
 -- CalendarDayButtonTemplate
 
@@ -4416,7 +4357,7 @@ function CalendarCreateEventMassInviteButton_OnUpdate(self)
 end
 
 function CalendarCreateEventMassInviteButton_Update()
-	if ( CalendarCanSendInvite() and (CanEditGuildEvent() or IsInArenaTeam()) ) then
+	if ( CalendarCanSendInvite() and CanEditGuildEvent() ) then
 		CalendarCreateEventMassInviteButton:Enable();
 	else
 		CalendarCreateEventMassInviteButton:Disable();
@@ -4544,7 +4485,6 @@ function CalendarMassInviteFrame_OnLoad(self)
 	self:RegisterEvent("CALENDAR_ACTION_PENDING");
 	self:RegisterEvent("GUILD_ROSTER_UPDATE");
 	self:RegisterEvent("PLAYER_GUILD_UPDATE");
-	self:RegisterEvent("ARENA_TEAM_UPDATE");
 
 	local minLevel, maxLevel = CalendarDefaultGuildFilter();
 	CalendarMassInviteGuildMinLevelEdit:SetNumber(minLevel);
@@ -4555,18 +4495,11 @@ function CalendarMassInviteFrame_OnLoad(self)
 	if ( IsInGuild() and GetNumGuildMembers() == 0 ) then
 		GuildRoster();
 	end
-	-- do the same for arena teams
-	for i = 1, MAX_ARENA_TEAMS do
-		ArenaTeamRoster(i);
-	end
-	-- update the arena team section in order to fill initial data
-	CalendarMassInviteArena_Update();
 end
 
 function CalendarMassInviteFrame_OnShow(self)
 	CalendarFrame_PushModal(self);
 	CalendarMassInviteGuild_Update();
-	CalendarMassInviteArena_Update();
 end
 
 function CalendarMassInviteFrame_OnEvent(self, event, ...)
@@ -4577,26 +4510,22 @@ function CalendarMassInviteFrame_OnEvent(self, event, ...)
 		end
 	end
 	if ( self:IsShown() ) then
-		if ( not CanEditGuildEvent() and not IsInArenaTeam() ) then
-			-- if we are no longer in a guild OR an arena team, we can't mass invite
+		if ( not CanEditGuildEvent() ) then
+			-- if we are no longer in a guild, we can't mass invite
 			CalendarMassInviteFrame:Hide();
 			CalendarCreateEventMassInviteButton_Update();
 		else
 			if ( event == "CALENDAR_ACTION_PENDING" ) then
 				CalendarMassInviteGuild_Update();
-				CalendarMassInviteArena_Update();
 			elseif ( event == "GUILD_ROSTER_UPDATE" or event == "PLAYER_GUILD_UPDATE" ) then
 				CalendarMassInviteGuild_Update();
-			elseif ( event == "ARENA_TEAM_UPDATE" ) then
-				CalendarMassInviteArena_Update();
 			end
 		end
 	end
 end
 
 function CalendarMassInviteFrame_OnUpdate(self)
 	CalendarMassInviteGuild_Update();
-	CalendarMassInviteArena_Update();
 end
 
 function CalendarMassInviteGuild_Update()
@@ -4657,51 +4586,6 @@ function CalendarMassInviteGuildAcceptButton_OnClick(self)
 	CalendarMassInviteFrame:Hide();
 end
 
-local ARENA_TEAMS = {2, 3, 5};
-function CalendarMassInviteArena_Update()
-	-- initialize the teams
-	local teamName, teamSize;
-	local button;
-	for i = 1, MAX_ARENA_TEAMS do
-		button = _G["CalendarMassInviteArenaButton"..ARENA_TEAMS[i]];
-		button.teamName = nil;
-		button:Disable();
-	end
-
-	-- set the teams
-	local canSendInvite = CalendarCanSendInvite();
-	for i = 1, MAX_ARENA_TEAMS do
-		teamName, teamSize = GetArenaTeam(i);
-		if ( canSendInvite and teamName ) then
-			button = _G["CalendarMassInviteArenaButton"..teamSize];
-			button:SetFormattedText(PVP_TEAMTYPE, teamSize, teamSize);
-			button.teamName = teamName;
-			button:SetID(i);
-			button:Enable();
-		end
-	end
-
-	-- optimization note: using two separate init and set loops yields less redundancy and less branches than two nested loops
-end
-
-function CalendarMassInviteArenaButton_OnLoad(self)
-	local teamSize = ARENA_TEAMS[self:GetID()];
-	self:SetFormattedText(PVP_TEAMTYPE, teamSize, teamSize);
-end
-
-function CalendarMassInviteArenaButton_OnClick(self)
-	CalendarMassInviteArenaTeam(self:GetID());
-	CalendarMassInviteFrame:Hide();
-end
-
-function CalendarMassInviteArenaButton_OnEnter(self)
-	if ( self.teamName ) then
-		GameTooltip:SetOwner(self, "ANCHOR_TOPRIGHT");
-		GameTooltip:SetText(self.teamName);
-	end
-end
-
-
 -- CalendarEventPickerFrame
 
 function CalendarEventPickerFrame_OnLoad(self)

AddOns/Blizzard_Calendar/Blizzard_Calendar.xml

@@ -438,13 +438,6 @@
 					<OnHide function="CalendarContextMenu_OnHide"/>
 				</Scripts>
 			</Frame>
-			<Frame name="CalendarArenaTeamContextMenu" inherits="UIMenuTemplate" frameStrata="FULLSCREEN" enableMouse="true" hidden="true" parent="CalendarContextMenu">
-				<Scripts>
-					<OnLoad function="CalendarArenaTeamContextMenu_OnLoad"/>
-					<OnShow function="CalendarArenaTeamContextMenu_OnShow"/>
-					<OnEvent function="CalendarArenaTeamContextMenu_OnEvent"/>
-				</Scripts>
-			</Frame>
 			<Frame name="CalendarInviteStatusContextMenu" inherits="UIMenuTemplate" frameStrata="FULLSCREEN" enableMouse="true" hidden="true" parent="CalendarContextMenu">
 				<Scripts>
 					<OnLoad function="CalendarInviteStatusContextMenu_OnLoad"/>
@@ -1491,14 +1484,6 @@
 						</Anchor>
 					</Anchors>
 				</FontString>
-				<FontString inherits="GameFontHighlightSmall" text="CALENDAR_MASSINVITE_ARENA_HELP" justifyH="CENTER">
-					<Size x="280" y="0"/>
-					<Anchors>
-						<Anchor point="TOP">
-							<Offset x="0" y="-160"/>
-						</Anchor>
-					</Anchors>
-				</FontString>
 			</Layer>
 		</Layers>
 		<Frames>
@@ -1561,27 +1546,6 @@
 					<OnClick function="CalendarMassInviteGuildAcceptButton_OnClick"/>
 				</Scripts>
 			</Button>
-			<Button name="CalendarMassInviteArenaButton2" inherits="CalendarMassInviteArenaButtonTemplate" id="1">
-				<Anchors>
-					<Anchor point="TOPLEFT">
-						<Offset x="14" y="-190"/>
-					</Anchor>
-				</Anchors>
-			</Button>
-			<Button name="CalendarMassInviteArenaButton3" inherits="CalendarMassInviteArenaButtonTemplate" id="2">
-				<Anchors>
-					<Anchor point="TOP">
-						<Offset x="0" y="-190"/>
-					</Anchor>
-				</Anchors>
-			</Button>
-			<Button name="CalendarMassInviteArenaButton5" inherits="CalendarMassInviteArenaButtonTemplate" id="3">
-				<Anchors>
-					<Anchor point="TOPRIGHT">
-						<Offset x="-14" y="-190"/>
-					</Anchor>
-				</Anchors>
-			</Button>
 			<Button name="CalendarMassInviteCloseButton" inherits="CalendarCloseButtonTemplate">
 				<Scripts>
 					<OnClick>

AddOns/Blizzard_EncounterJournal/Blizzard_EncounterJournal.lua

@@ -116,6 +116,7 @@ function EncounterJournal_OnLoad(self)
 	UIDropDownMenu_Initialize(self.encounter.info.lootScroll.lootFilter, EncounterJournal_InitLootFilter, "MENU");
 end
 
+local worldBossInstanceIDs = { 322 }
 
 function EncounterJournal_OnShow(self)
 	UpdateMicroButtons();
@@ -131,7 +132,11 @@ function EncounterJournal_OnShow(self)
 		EncounterJournal.lastInstance = instanceID;
 		EncounterJournal.difficultyID = difficultyID;
 		if ( difficultyID == 0 ) then
-			difficultyID = EJ_DIFFICULTIES[1].difficultyID; 	-- default to 5-man normal
+			if tContains( worldBossInstanceIDs, instanceID ) then
+				difficultyID = EJ_DIFFICULTIES[6].difficultyID;     -- default to 25-man normal for world bosses
+			else
+				difficultyID = EJ_DIFFICULTIES[1].difficultyID; 	-- default to 5-man normal
+			end
 		end
 		EJ_SetDifficulty(difficultyID);
 	elseif ( EncounterJournal.queuedPortraitUpdate ) then

AddOns/Blizzard_GuildUI/Blizzard_GuildRoster.lua

@@ -311,13 +311,6 @@ function GuildRoster_Update()
 				GuildRosterButton_SetStringText(button.string2, displayedName, onlineOrMobile, classFileName);
 				GuildRosterButton_SetStringText(button.string3, valor, onlineOrMobile);
 				GuildRosterButton_SetStringText(button.string4, hero, onlineOrMobile);
-			elseif ( currentGuildView == "pvp" ) then
-				local bgRating, arenaRating, arenaTeam = GetGuildRosterPVPRatings(index);
-				GuildRosterButton_SetStringText(button.string1, level, onlineOrMobile);
-				button.icon:SetTexCoord(unpack(CLASS_ICON_TCOORDS[classFileName]));
-				GuildRosterButton_SetStringText(button.string2, displayedName, onlineOrMobile, classFileName);
-				GuildRosterButton_SetStringText(button.string3, bgRating, onlineOrMobile);
-				GuildRosterButton_SetStringText(button.string4, string.format(GUILD_ROSTER_ARENA_RATING, arenaRating, arenaTeam, arenaTeam), onlineOrMobile);
 			elseif ( currentGuildView == "achievement" ) then
 				GuildRosterButton_SetStringText(button.string1, level, onlineOrMobile);
 				button.icon:SetTexCoord(unpack(CLASS_ICON_TCOORDS[classFileName]));

AddOns/Blizzard_InspectUI/InspectPVPFrame.lua

@@ -25,7 +25,6 @@ function InspectPVPFrame_Update()
 	local rating, played, won = GetInspectRatedBGData();
 	InspectPVPFrame.RatedBG.Rating:SetText(rating);
 	InspectPVPFrame.RatedBG.Record:SetText(won.."-"..(played-won));
-
 	for i=1, MAX_ARENA_TEAMS do
 		local arenarating, seasonPlayed, seasonWon, weeklyPlayed, weeklyWon = GetInspectArenaData(i);
 		local frame = arenaFrames[i];

AddOns/Blizzard_ItemUpgradeUI/Blizzard_ItemUpgradeUI.lua

@@ -231,7 +231,14 @@ function ItemUpgradeFrame_UpdateStats(setStatsRight)
 		end
 		local leftText, rightText = GetItemUpgradeEffect(i);
 		row.LeftText:SetText(leftText);
-		row.RightText:SetText(ItemUpgradeFrame_GetUpgradedEffectString(leftText, rightText));
+
+		if ( setStatsRight ) then
+			row.RightText:SetText(ItemUpgradeFrame_GetUpgradedEffectString(leftText, rightText));
+			row.RightText:Show();
+		else
+			row.RightText:Hide();
+		end
+
 		local height = max(row.LeftText:GetHeight(), row.RightText:GetHeight());
 		row:SetHeight(height + 3);
 		row:Show();