Build 19551

tekkub · Jan 30, 2015 · 21408f6 · 21408f6
1 parent 412ac8d
commit 21408f6
Show file tree

Hide file tree

Showing 60 changed files with 126 additions and 105 deletions.
diff --git a/AddOns/Blizzard_AchievementUI/Blizzard_AchievementUI.toc b/AddOns/Blizzard_AchievementUI/Blizzard_AchievementUI.toc
@@ -1,4 +1,4 @@
-## Interface: 60000
+## Interface: 60100
 ## Title: Blizzard_AchievementUI
 ## Notes: Hooray for Achievements! Everybody loves Achievements =D
 ## Secure: 1

diff --git a/AddOns/Blizzard_ArchaeologyUI/Blizzard_ArchaeologyUI.toc b/AddOns/Blizzard_ArchaeologyUI/Blizzard_ArchaeologyUI.toc
@@ -1,4 +1,4 @@
-## Interface: 60000
+## Interface: 60100
 ## Title: Blizzard Archaeology UI
 ## Secure: 1
 ## LoadOnDemand: 1

diff --git a/AddOns/Blizzard_ArenaUI/Blizzard_ArenaUI.toc b/AddOns/Blizzard_ArenaUI/Blizzard_ArenaUI.toc
@@ -1,4 +1,4 @@
-## Interface: 60000
+## Interface: 60100
 ## Title: Blizzard Arena UI
 ## Secure: 1
 ## LoadOnDemand: 1

diff --git a/AddOns/Blizzard_AuctionUI/Blizzard_AuctionUI.toc b/AddOns/Blizzard_AuctionUI/Blizzard_AuctionUI.toc
@@ -1,4 +1,4 @@
-## Interface: 60000
+## Interface: 60100
 ## Title: Blizzard Auction UI
 ## Secure: 1
 ## LoadOnDemand: 1

diff --git a/AddOns/Blizzard_AuthChallengeUI/Blizzard_AuthChallengeUI.toc b/AddOns/Blizzard_AuthChallengeUI/Blizzard_AuthChallengeUI.toc
@@ -1,4 +1,4 @@
-## Interface: 60000
+## Interface: 60100
 ## Title: Blizzard Auth Challenge UI
 ## Secure: 1
 ## LoadOnDemand: 0

diff --git a/AddOns/Blizzard_BarbershopUI/Blizzard_BarberShopUI.toc b/AddOns/Blizzard_BarbershopUI/Blizzard_BarberShopUI.toc
@@ -1,4 +1,4 @@
-## Interface: 60000
+## Interface: 60100
 ## Title: Blizzard Barber Shop UI
 ## Notes: The barber's blade went snicker-snack! Have you seen my Jabberwocky?
 ## Secure: 1

diff --git a/AddOns/Blizzard_BattlefieldMinimap/Blizzard_BattlefieldMinimap.toc b/AddOns/Blizzard_BattlefieldMinimap/Blizzard_BattlefieldMinimap.toc
@@ -1,4 +1,4 @@
-## Interface: 60000
+## Interface: 60100
 ## Title: Blizzard Battlefield Minimap
 ## Secure: 1
 ## LoadOnDemand: 1

diff --git a/AddOns/Blizzard_BindingUI/Blizzard_BindingUI.toc b/AddOns/Blizzard_BindingUI/Blizzard_BindingUI.toc
@@ -1,4 +1,4 @@
-## Interface: 60000
+## Interface: 60100
 ## Title: Blizzard Key Binding UI
 ## Secure: 1
 ## LoadOnDemand: 1

diff --git a/AddOns/Blizzard_BlackMarketUI/Blizzard_BlackMarketUI.toc b/AddOns/Blizzard_BlackMarketUI/Blizzard_BlackMarketUI.toc
@@ -1,4 +1,4 @@
-## Interface: 60000
+## Interface: 60100
 ## Title: Black Market UI
 ## Secure: 1
 ## LoadOnDemand: 1

diff --git a/AddOns/Blizzard_CUFProfiles/Blizzard_CUFProfiles.toc b/AddOns/Blizzard_CUFProfiles/Blizzard_CUFProfiles.toc
@@ -1,4 +1,4 @@
-## Interface: 60000
+## Interface: 60100
 ## Title: Blizzard_CUFProfiles
 ## Secure: 1
 ## LoadOnDemand: 0

diff --git a/AddOns/Blizzard_Calendar/Blizzard_Calendar.toc b/AddOns/Blizzard_Calendar/Blizzard_Calendar.toc
@@ -1,4 +1,4 @@
-## Interface: 60000
+## Interface: 60100
 ## Title: Blizzard Calendar
 ## Secure: 1
 ## LoadOnDemand: 1

diff --git a/AddOns/Blizzard_ChallengesUI/Blizzard_ChallengesUI.toc b/AddOns/Blizzard_ChallengesUI/Blizzard_ChallengesUI.toc
@@ -1,4 +1,4 @@
-## Interface: 60000
+## Interface: 60100
 ## Title: Blizzard Challenges UI
 ## Secure: 1
 ## LoadOnDemand: 1

diff --git a/AddOns/Blizzard_ClientSavedVariables/Blizzard_ClientSavedVariables.toc b/AddOns/Blizzard_ClientSavedVariables/Blizzard_ClientSavedVariables.toc
@@ -1,4 +1,4 @@
-## Interface: 60000
+## Interface: 60100
 ## Title: Blizzard_ClientSavedVariables
 ## Secure: 1
 ## LoadOnDemand: 0

diff --git a/AddOns/Blizzard_Collections/Blizzard_Collections.toc b/AddOns/Blizzard_Collections/Blizzard_Collections.toc
@@ -1,4 +1,4 @@
-## Interface: 60000
+## Interface: 60100
 ## Title: Blizzard Collections
 ## Notes: Collections
 ## Secure: 1

diff --git a/AddOns/Blizzard_CombatLog/Blizzard_CombatLog.toc b/AddOns/Blizzard_CombatLog/Blizzard_CombatLog.toc
@@ -1,4 +1,4 @@
-## Interface: 60000
+## Interface: 60100
 ## Title: Blizzard CombatLog
 ## Secure: 1
 ## LoadOnDemand: 1

diff --git a/AddOns/Blizzard_CombatText/Blizzard_CombatText.toc b/AddOns/Blizzard_CombatText/Blizzard_CombatText.toc
@@ -1,4 +1,4 @@
-## Interface: 60000
+## Interface: 60100
 ## Title: Blizzard CombatText
 ## Secure: 1
 ## LoadOnDemand: 1

diff --git a/AddOns/Blizzard_CompactRaidFrames/Blizzard_CompactRaidFrames.toc b/AddOns/Blizzard_CompactRaidFrames/Blizzard_CompactRaidFrames.toc
@@ -1,4 +1,4 @@
-## Interface: 60000
+## Interface: 60100
 ## Title: Blizzard Compact Raid Frames
 ## Secure: 1
 ## LoadOnDemand: 0

diff --git a/AddOns/Blizzard_DeathRecap/Blizzard_DeathRecap.lua b/AddOns/Blizzard_DeathRecap/Blizzard_DeathRecap.lua
@@ -78,7 +78,7 @@ function DeathRecapFrame_OpenRecap( recapID )
 		if( not evtData.hideCaster ) then
 			dmgInfo.caster = evtData.sourceName or COMBATLOG_UNKNOWN_UNIT
 		else
-			dmgInfo.caster = "";
+			dmgInfo.caster = nil;
 		end
 		dmgInfo.school = evtData.school;
 
@@ -130,10 +130,12 @@ function DeathRecapFrame_Amount_OnEnter(self)
 		GameTooltip:AddLine(format(DEATH_RECAP_DAMAGE_TT, valueStr, self.dmgExtraStr), 1, 0, 0, true);
 	end
 
-	if( self.spellName and self.caster ) then
-		GameTooltip:AddLine(format(DEATH_RECAP_CAST_BY_TT, self.spellName, self.caster), 1, 1, 1, true );
-	elseif( self.spellName ) then
-		GameTooltip:AddLine(self.spellName, 1, 1, 1, true );
+	if( self.spellName ) then
+		if( self.caster and #self.caster > 0 ) then
+			GameTooltip:AddLine(format(DEATH_RECAP_CAST_BY_TT, self.spellName, self.caster), 1, 1, 1, true );
+		else
+			GameTooltip:AddLine(self.spellName, 1, 1, 1, true );
+		end
 	end
 
 	local seconds = -floor((self.timestamp - DeathRecapFrame.DeathTimeStamp)*10)/10;

diff --git a/AddOns/Blizzard_DeathRecap/Blizzard_DeathRecap.toc b/AddOns/Blizzard_DeathRecap/Blizzard_DeathRecap.toc
@@ -1,4 +1,4 @@
-## Interface: 60000
+## Interface: 60100
 ## Title: Blizzard DeathRecap
 ## Secure: 1
 ## LoadOnDemand: 1

diff --git a/AddOns/Blizzard_DebugTools/Blizzard_DebugTools.toc b/AddOns/Blizzard_DebugTools/Blizzard_DebugTools.toc
@@ -1,4 +1,4 @@
-## Interface: 60000
+## Interface: 60100
 ## Title: Blizzard UI Debug Tools
 ## Notes: Tools for developing addons
 ## Secure: 1

diff --git a/AddOns/Blizzard_EncounterJournal/Blizzard_EncounterJournal.toc b/AddOns/Blizzard_EncounterJournal/Blizzard_EncounterJournal.toc
@@ -1,4 +1,4 @@
-## Interface: 60000
+## Interface: 60100
 ## Title: Blizzard Dungeon Journal
 ## Notes:  Show Boss Info
 ## Secure: 1

diff --git a/AddOns/Blizzard_GMChatUI/Blizzard_GMChatUI.toc b/AddOns/Blizzard_GMChatUI/Blizzard_GMChatUI.toc
@@ -1,4 +1,4 @@
-## Interface: 60000
+## Interface: 60100
 ## Title: Blizzard_GMChatUI
 ## Secure: 1
 ## LoadOnDemand: 1

diff --git a/AddOns/Blizzard_GMSurveyUI/Blizzard_GMSurveyUI.toc b/AddOns/Blizzard_GMSurveyUI/Blizzard_GMSurveyUI.toc
@@ -1,4 +1,4 @@
-## Interface: 60000
+## Interface: 60100
 ## Title: Blizzard GM Survey UI
 ## Secure: 1
 ## LoadOnDemand: 1

diff --git a/AddOns/Blizzard_GarrisonUI/Blizzard_GarrisonMissionUI.lua b/AddOns/Blizzard_GarrisonUI/Blizzard_GarrisonMissionUI.lua
@@ -601,16 +601,6 @@ function GarrisonMissionList_Update()
 			else
 				button.Summary:SetFormattedText(PARENS_TEMPLATE, mission.duration);
 			end
-			if ( button.Title:GetWidth() + button.Summary:GetWidth() + 8 < 655 - mission.numRewards * 65 ) then
-				button.Title:SetPoint("LEFT", 165, 0);
-				button.Summary:ClearAllPoints();
-				button.Summary:SetPoint("BOTTOMLEFT", button.Title, "BOTTOMRIGHT", 8, 0);
-			else
-				button.Title:SetPoint("LEFT", 165, 10);
-				button.Title:SetWidth(655 - mission.numRewards * 65);
-				button.Summary:ClearAllPoints();
-				button.Summary:SetPoint("TOPLEFT", button.Title, "BOTTOMLEFT", 0, -4);	
-			end
 			if ( mission.locPrefix ) then
 				button.LocBG:Show();
 				button.LocBG:SetAtlas(mission.locPrefix.."-List");
@@ -647,6 +637,16 @@ function GarrisonMissionList_Update()
 			else
 				button.Overlay:Hide();
 			end
+			if ( button.Title:GetWidth() + button.Summary:GetWidth() + 8 < 655 - mission.numRewards * 65 ) then
+				button.Title:SetPoint("LEFT", 165, 0);
+				button.Summary:ClearAllPoints();
+				button.Summary:SetPoint("BOTTOMLEFT", button.Title, "BOTTOMRIGHT", 8, 0);
+			else
+				button.Title:SetPoint("LEFT", 165, 10);
+				button.Title:SetWidth(655 - mission.numRewards * 65);
+				button.Summary:ClearAllPoints();
+				button.Summary:SetPoint("TOPLEFT", button.Title, "BOTTOMLEFT", 0, -4);	
+			end			
 			button.MissionType:SetAtlas(mission.typeAtlas);
 			GarrisonMissionButton_SetRewards(button, mission.rewards, mission.numRewards);
 			button:Show();
@@ -798,11 +798,9 @@ function GarrisonMissionButton_SetInProgressTooltip(missionInfo, showRewards)
 	else
 		GameTooltip:AddLine(format(GARRISON_MISSION_LEVEL_TOOLTIP, missionInfo.level), 1, 1, 1);
 	end
-	-- time
+	-- completed?
 	if(missionInfo.isComplete) then
 		GameTooltip:AddLine(COMPLETE, 1, 1, 1);
-	else
-		GameTooltip:AddLine(tostring(missionInfo.timeLeft), 1, 1, 1);
 	end
 	-- success chance
 	local successChance = C_Garrison.GetMissionSuccessChance(missionInfo.missionID);
@@ -1005,7 +1003,11 @@ end
 
 function GarrisonMissionPageFollowerFrame_OnMouseUp(self, button)
 	if ( button == "RightButton" ) then
-		GarrisonMissionPage_ClearFollower(self, true);
+		if ( self.info ) then
+			GarrisonMissionPage_ClearFollower(self, true);
+		else
+			MISSION_PAGE_FRAME.CloseButton:Click();
+		end
 	end
 end
 

diff --git a/AddOns/Blizzard_GarrisonUI/Blizzard_GarrisonMissionUI.xml b/AddOns/Blizzard_GarrisonUI/Blizzard_GarrisonMissionUI.xml
@@ -1817,7 +1817,7 @@
 									<Anchor point="BOTTOMRIGHT" relativePoint="TOPRIGHT"/>
 								</Anchors>
 							</Frame>
-							<Frame parentKey="CompleteDialog" enableMouse="true" frameStrata="HIGH" hidden="true">
+							<Frame parentKey="CompleteDialog" topLevel="true" enableMouse="true" hidden="true">
 								<Size x="956" y="637"/>
 								<Anchors>
 									<Anchor point="TOPLEFT" x="-33" y="43"/>

diff --git a/AddOns/Blizzard_GarrisonUI/Blizzard_GarrisonUI.toc b/AddOns/Blizzard_GarrisonUI/Blizzard_GarrisonUI.toc
@@ -1,4 +1,4 @@
-## Interface: 60000
+## Interface: 60100
 ## Title: Blizzard Garrison UI
 ## Secure: 1
 ## Author: Blizzard Entertainment

diff --git a/AddOns/Blizzard_GlyphUI/Blizzard_GlyphUI.toc b/AddOns/Blizzard_GlyphUI/Blizzard_GlyphUI.toc
@@ -1,4 +1,4 @@
-## Interface: 60000
+## Interface: 60100
 ## Title: Blizzard Glyph UI
 ## Notes:  Get some cool tats and mod your spells.
 ## Secure: 1

diff --git a/AddOns/Blizzard_GuildBankUI/Blizzard_GuildBankUI.toc b/AddOns/Blizzard_GuildBankUI/Blizzard_GuildBankUI.toc
@@ -1,4 +1,4 @@
-## Interface: 60000
+## Interface: 60100
 ## Title: Blizzard Guild Bank UI
 ## Secure: 1
 ## LoadOnDemand: 1

diff --git a/AddOns/Blizzard_GuildControlUI/Blizzard_GuildControlUI.toc b/AddOns/Blizzard_GuildControlUI/Blizzard_GuildControlUI.toc
@@ -1,4 +1,4 @@
-## Interface: 60000
+## Interface: 60100
 ## Title: Blizzard Guild Control UI
 ## Secure: 1
 ## LoadOnDemand: 1

diff --git a/AddOns/Blizzard_GuildUI/Blizzard_GuildUI.toc b/AddOns/Blizzard_GuildUI/Blizzard_GuildUI.toc
@@ -1,4 +1,4 @@
-## Interface: 60000
+## Interface: 60100
 ## Title: Blizzard Guild UI
 ## Secure: 1
 ## LoadOnDemand: 1

diff --git a/AddOns/Blizzard_InspectUI/Blizzard_InspectUI.toc b/AddOns/Blizzard_InspectUI/Blizzard_InspectUI.toc
@@ -1,4 +1,4 @@
-## Interface: 60000
+## Interface: 60100
 ## Title: Blizzard Inspect UI
 ## Secure: 1
 ## LoadOnDemand: 1

diff --git a/AddOns/Blizzard_ItemAlterationUI/Blizzard_ItemAlterationUI.toc b/AddOns/Blizzard_ItemAlterationUI/Blizzard_ItemAlterationUI.toc
@@ -1,4 +1,4 @@
-## Interface: 60000
+## Interface: 60100
 ## Title: Blizzard Item Alteration UI
 ## Secure: 1
 ## Author: Blizzard Entertainment

diff --git a/AddOns/Blizzard_ItemSocketingUI/Blizzard_ItemSocketingUI.toc b/AddOns/Blizzard_ItemSocketingUI/Blizzard_ItemSocketingUI.toc
@@ -1,4 +1,4 @@
-## Interface: 60000
+## Interface: 60100
 ## Title: Blizzard Item Socketing UI
 ## Secure: 1
 ## LoadOnDemand: 1

diff --git a/AddOns/Blizzard_ItemUpgradeUI/Blizzard_ItemUpgradeUI.toc b/AddOns/Blizzard_ItemUpgradeUI/Blizzard_ItemUpgradeUI.toc
@@ -1,4 +1,4 @@
-## Interface: 60000
+## Interface: 60100
 ## Title: Blizzard Item Upgrade UI
 ## Secure: 1
 ## LoadOnDemand: 1

diff --git a/AddOns/Blizzard_LookingForGuildUI/Blizzard_LookingForGuildUI.toc b/AddOns/Blizzard_LookingForGuildUI/Blizzard_LookingForGuildUI.toc
@@ -1,4 +1,4 @@
-## Interface: 60000
+## Interface: 60100
 ## Title: Blizzard LookingForGuild UI
 ## Secure: 1
 ## LoadOnDemand: 1

diff --git a/AddOns/Blizzard_MacroUI/Blizzard_MacroUI.toc b/AddOns/Blizzard_MacroUI/Blizzard_MacroUI.toc
@@ -1,4 +1,4 @@
-## Interface: 60000
+## Interface: 60100
 ## Title: Blizzard Macro UI
 ## Secure: 1
 ## LoadOnDemand: 1

diff --git a/AddOns/Blizzard_MovePad/Blizzard_MovePad.toc b/AddOns/Blizzard_MovePad/Blizzard_MovePad.toc
@@ -1,4 +1,4 @@
-## Interface: 60000
+## Interface: 60100
 ## Title: Blizzard MovePad
 ## Author: slouken and karl
 ## Notes: A clickable movement pad

diff --git a/AddOns/Blizzard_ObjectiveTracker/Blizzard_ObjectiveTracker.toc b/AddOns/Blizzard_ObjectiveTracker/Blizzard_ObjectiveTracker.toc
@@ -1,4 +1,4 @@
-## Interface: 60000
+## Interface: 60100
 ## Title: Blizzard Objective Tracker UI
 ## Secure: 1
 ## LoadOnDemand: 0

diff --git a/AddOns/Blizzard_PVPUI/Blizzard_PVPUI.toc b/AddOns/Blizzard_PVPUI/Blizzard_PVPUI.toc
@@ -1,4 +1,4 @@
-## Interface: 60000
+## Interface: 60100
 ## Title: Blizzard PVP UI
 ## Notes:  MegaQueue
 ## Secure: 1

diff --git a/AddOns/Blizzard_PetBattleUI/Blizzard_PetBattleUI.toc b/AddOns/Blizzard_PetBattleUI/Blizzard_PetBattleUI.toc
@@ -1,4 +1,4 @@
-## Interface: 60000
+## Interface: 60100
 ## Title: Blizzard Pet Battle UI
 ## Secure: 1
 ## LoadOnDemand: 0

diff --git a/AddOns/Blizzard_QuestChoice/Blizzard_QuestChoice.toc b/AddOns/Blizzard_QuestChoice/Blizzard_QuestChoice.toc
@@ -1,4 +1,4 @@
-## Interface: 60000
+## Interface: 60100
 ## Title: Blizzard Quest Choice UI
 ## Secure: 1
 ## LoadOnDemand: 1

diff --git a/AddOns/Blizzard_RaidUI/Blizzard_RaidUI.toc b/AddOns/Blizzard_RaidUI/Blizzard_RaidUI.toc
@@ -1,4 +1,4 @@
-## Interface: 60000
+## Interface: 60100
 ## Title: Blizzard Raid UI
 ## Secure: 1
 ## LoadOnDemand: 1

diff --git a/AddOns/Blizzard_SocialUI/Blizzard_SocialUI.toc b/AddOns/Blizzard_SocialUI/Blizzard_SocialUI.toc
@@ -1,4 +1,4 @@
-## Interface: 60000
+## Interface: 60100
 ## Title: Blizzard Social UI
 ## Secure: 1
 ## Author: Blizzard Entertainment

diff --git a/AddOns/Blizzard_StoreUI/Blizzard_StoreUI.toc b/AddOns/Blizzard_StoreUI/Blizzard_StoreUI.toc
@@ -1,4 +1,4 @@
-## Interface: 60000
+## Interface: 60100
 ## Title: Blizzard Store UI
 ## Secure: 1
 Blizzard_StoreUI.xml

diff --git a/AddOns/Blizzard_TalentUI/Blizzard_TalentUI.toc b/AddOns/Blizzard_TalentUI/Blizzard_TalentUI.toc
@@ -1,4 +1,4 @@
-## Interface: 60000
+## Interface: 60100
 ## Title: Blizzard Talent UI
 ## Secure: 1
 ## LoadOnDemand: 1

diff --git a/AddOns/Blizzard_TimeManager/Blizzard_TimeManager.toc b/AddOns/Blizzard_TimeManager/Blizzard_TimeManager.toc
@@ -1,4 +1,4 @@
-## Interface: 60000
+## Interface: 60100
 ## Title: Blizzard Time Manager
 ## Secure: 1
 ## LoadOnDemand: 1

diff --git a/AddOns/Blizzard_TokenUI/Blizzard_TokenUI.toc b/AddOns/Blizzard_TokenUI/Blizzard_TokenUI.toc
@@ -1,4 +1,4 @@
-## Interface: 60000
+## Interface: 60100
 ## Title: Blizzard_TokenUI
 ## Secure: 1
 Blizzard_TokenUI.lua

diff --git a/AddOns/Blizzard_TradeSkillUI/Blizzard_TradeSkillUI.toc b/AddOns/Blizzard_TradeSkillUI/Blizzard_TradeSkillUI.toc
@@ -1,4 +1,4 @@
-## Interface: 60000
+## Interface: 60100
 ## Title: Blizzard Trade Skill UI
 ## Secure: 1
 ## LoadOnDemand: 1

diff --git a/AddOns/Blizzard_TrainerUI/Blizzard_TrainerUI.toc b/AddOns/Blizzard_TrainerUI/Blizzard_TrainerUI.toc
@@ -1,4 +1,4 @@
-## Interface: 60000
+## Interface: 60100
 ## Title: Blizzard Trainer UI
 ## Secure: 1
 ## LoadOnDemand: 1

diff --git a/AddOns/Blizzard_Tutorial/Blizzard_Tutorial.toc b/AddOns/Blizzard_Tutorial/Blizzard_Tutorial.toc
@@ -1,6 +1,6 @@
 ## Author: Blizzard Entertainment
 ## Title: Blizzard Tutorial
-## Interface: 60000
+## Interface: 60100
 ## Secure: 1
 ## LoadOnDemand: 1
 # Inspired by the Newbie Assistant written by 网易

diff --git a/AddOns/Blizzard_VoidStorageUI/Blizzard_VoidStorageUI.toc b/AddOns/Blizzard_VoidStorageUI/Blizzard_VoidStorageUI.toc
@@ -1,4 +1,4 @@
-## Interface: 60000
+## Interface: 60100
 ## Title: Blizzard Void Storage UI
 ## Secure: 1
 ## Author: Blizzard Entertainment

diff --git a/FrameXML/FrameXML.toc b/FrameXML/FrameXML.toc
@@ -1,5 +1,5 @@
 # Do not delete the following line!
-## Interface: 60000
+## Interface: 60100
 GlobalStrings.lua
 Constants.lua
 Localization.xml