More Fixes and comment out stuff for now. Note: Skins are disabled fo…

…r now

ElvUI/Core/Developer/Frame.lua

@@ -2,7 +2,7 @@ local print, strmatch, strlower = print, strmatch, strlower
 local _G, UNKNOWN, format, type, next = _G, UNKNOWN, format, type, next
 
 local SlashCmdList = SlashCmdList
-local GetMouseFocus = GetMouseFocus
+local GetMouseFocus = GetMouseFoci or GetMouseFocus
 local UIParentLoadAddOn = UIParentLoadAddOn
 
 local GetAddOnInfo = (C_AddOns and C_AddOns.GetAddOnInfo) or GetAddOnInfo

ElvUI/Core/General/API.lua

@@ -775,9 +775,10 @@ function E:SetupGameMenu()
 	GameMenuFrame.ElvUI = button
 
 	if not E:IsAddOnEnabled('ConsolePortUI_Menu') then
-		button:Size(GameMenuButtonLogout:GetWidth(), GameMenuButtonLogout:GetHeight())
-		button:Point('TOPLEFT', GameMenuButtonAddons, 'BOTTOMLEFT', 0, -1)
-		hooksecurefunc('GameMenuFrame_UpdateVisibleButtons', E.PositionGameMenuButton)
+		button:Size(100, 30)
+		button:Point('TOPLEFT', GameMenuFrame, 'BOTTOMLEFT', 0, -1)
+		-- FIX ME 11.0
+		--hooksecurefunc('GameMenuFrame_UpdateVisibleButtons', E.PositionGameMenuButton)
 	end
 end
 

ElvUI/Core/General/Config.lua

@@ -15,7 +15,7 @@ local CreateFrame = CreateFrame
 local InCombatLockdown = InCombatLockdown
 local IsAltKeyDown = IsAltKeyDown
 local IsControlKeyDown = IsControlKeyDown
-local GetMouseFocus = GetMouseFocus
+local GetMouseFocus = GetMouseFoci or GetMouseFocus
 local UIParent = UIParent
 
 local EditBox_HighlightText = EditBox_HighlightText

ElvUI/Core/Modules/ActionBars/ActionBars.lua

@@ -10,7 +10,7 @@ local ClearOverrideBindings = ClearOverrideBindings
 local CreateFrame = CreateFrame
 local GetBindingKey = GetBindingKey
 local GetOverrideBarIndex = GetOverrideBarIndex
-local GetSpellBookItemInfo = GetSpellBookItemInfo
+local GetSpellBookItemInfo = C_SpellBook and C_SpellBook.GetSpellBookItemInfo or GetSpellBookItemInfo
 local GetTempShapeshiftBarIndex = GetTempShapeshiftBarIndex
 local GetVehicleBarIndex = GetVehicleBarIndex
 local HasOverrideActionBar = HasOverrideActionBar
@@ -1120,7 +1120,9 @@ do
 			end
 		end
 
-		AB:FixSpellBookTaint()
+		if not E.Retail then
+			AB:FixSpellBookTaint()
+		end
 
 		-- shut down some events for things we dont use
 		_G.ActionBarController:UnregisterAllEvents()

ElvUI/Core/Modules/ActionBars/Bind.lua

@@ -329,9 +329,11 @@ function AB:LoadKeyBinder()
 	bind:SetScript('OnMouseUp', function(_, key) self:BindListener(key) end)
 	bind:SetScript('OnMouseWheel', function(_, delta) if delta>0 then self:BindListener('MOUSEWHEELUP') else self:BindListener('MOUSEWHEELDOWN') end end)
 
-	for i = 1, 12 do
-		local b = _G['SpellButton'..i]
-		b:HookScript('OnEnter', function(s) AB:BindUpdate(s, 'SPELL') end)
+	if not E.Retail then
+		for i = 1, 12 do
+			local b = _G['SpellButton'..i]
+			b:HookScript('OnEnter', function(s) AB:BindUpdate(s, 'SPELL') end)
+		end
 	end
 
 	local function buttonOnEnter(b) AB:BindUpdate(b) end

ElvUI/Core/Modules/Bags/Bags.lua

@@ -2922,7 +2922,8 @@ function B:Initialize()
 	if E.Wrath then
 		B:SecureHook('BackpackTokenFrame_Update', 'UpdateTokens')
 	elseif E.Retail then
-		B:RawHook('TokenFrame_SetTokenWatched', 'TokenFrame_SetTokenWatched', true)
+		-- Fix ME 11.0
+		--B:RawHook('TokenFrame_SetTokenWatched', 'TokenFrame_SetTokenWatched', true)
 	end
 
 	if E.Retail then

ElvUI/Core/Modules/Chat/Chat.lua

@@ -25,7 +25,7 @@ local GetChatWindowInfo = GetChatWindowInfo
 local GetCursorPosition = GetCursorPosition
 local GetGuildRosterMOTD = GetGuildRosterMOTD
 local GetInstanceInfo = GetInstanceInfo
-local GetMouseFocus = GetMouseFocus
+local GetMouseFocus = GetMouseFoci or GetMouseFocus
 local GetNumGroupMembers = GetNumGroupMembers
 local GetPlayerCommunityLink = GetPlayerCommunityLink
 local GetPlayerInfoByGUID = GetPlayerInfoByGUID

ElvUI/Core/Modules/Misc/EditorMode.lua

@@ -122,7 +122,8 @@ function EM:Initialize()
 	_G.EditModeManagerFrame.onCloseCallback = EM.OnClose
 
 	-- keep the button off during combat
-	hooksecurefunc(_G.GameMenuButtonEditMode, 'SetEnabled', EM.SetEnabled)
+	-- Fix ME 11.0
+	--hooksecurefunc(_G.GameMenuButtonEditMode, 'SetEnabled', EM.SetEnabled)
 
 	-- wait for combat leave to do stuff
 	EM:RegisterEvent('EDIT_MODE_LAYOUTS_UPDATED', 'LAYOUTS_UPDATED')

ElvUI/Core/Modules/Tooltip/Tooltip.lua

@@ -22,7 +22,7 @@ local GetCraftSelectionIndex = GetCraftSelectionIndex
 local GetCreatureDifficultyColor = GetCreatureDifficultyColor
 local GetGuildInfo = GetGuildInfo
 local GetItemCount = C_Item and C_Item.GetItemCount or GetItemCount
-local GetMouseFocus = GetMouseFocus
+local GetMouseFocus = GetMouseFoci or GetMouseFocus
 local GetNumGroupMembers = GetNumGroupMembers
 local GetRelativeDifficultyColor = GetRelativeDifficultyColor
 local GetTime = GetTime

ElvUI/Mainline/Modules/Blizzard/ObjectiveFrame.lua

@@ -46,15 +46,21 @@ local function ObjectiveTracker_UpdateBackground()
 	end
 end
 
+-- Fix me for 11.0
 local function ObjectiveTracker_Collapse()
+	if E.Retail then return end
+
 	Tracker.collapsed = true
 	Tracker.BlocksFrame:Hide()
 	Tracker.HeaderMenu.MinimizeButton:SetCollapsed(true)
 	Tracker.HeaderMenu.Title:Show()
 	ObjectiveTracker_UpdateBackground()
 end
 
+-- Fix me for 11.0
 local function ObjectiveTracker_Expand()
+	if E.Retail then return end
+
 	Tracker.collapsed = nil
 	Tracker.BlocksFrame:Show()
 	Tracker.HeaderMenu.MinimizeButton:SetCollapsed(false)
@@ -63,7 +69,9 @@ local function ObjectiveTracker_Expand()
 end
 -- end clone
 
+-- Fix me for 11.0
 function BL:ObjectiveTracker_AutoHideOnHide()
+	if E.Retail then return end
 	if Tracker.collapsed then return end
 
 	if E.db.general.objectiveFrameAutoHideInKeystone then
@@ -76,14 +84,18 @@ function BL:ObjectiveTracker_AutoHideOnHide()
 	end
 end
 
+-- Fix me for 11.0
 function BL:ObjectiveTracker_AutoHideOnShow()
+	if E.Retail then return end
+
 	if Tracker.collapsed then
 		ObjectiveTracker_Expand()
 	end
 end
 
 function BL:ObjectiveTracker_Setup()
-	hooksecurefunc(_G.BonusObjectiveRewardsFrameMixin, 'AnimateReward', BonusRewards_SetPosition)
+	-- FIX ME 11.0 mostly not there anymore
+	--hooksecurefunc(_G.ObjectiveTrackerRewardsToastMixin, 'AnimateReward', BonusRewards_SetPosition)
 
 	BL:ObjectiveTracker_AutoHide()
 end

ElvUI/Mainline/Modules/DataTexts/Missions.lua

@@ -6,7 +6,7 @@ local next, wipe, ipairs = next, wipe, ipairs
 local format, sort, select = format, sort, select
 
 local EasyMenu = EasyMenu
-local GetMouseFocus = GetMouseFocus
+local GetMouseFoci = GetMouseFoci
 local HideUIPanel = HideUIPanel
 local IsShiftKeyDown = IsShiftKeyDown
 local BreakUpLargeNumbers = BreakUpLargeNumbers
@@ -362,7 +362,7 @@ local function OnEvent(self, event, ...)
 		self.text:SetText(AddInfo(MAIN_CURRENCY))
 	end
 
-	if event == 'MODIFIER_STATE_CHANGED' and not IsAltKeyDown() and GetMouseFocus() == self then
+	if event == 'MODIFIER_STATE_CHANGED' and not IsAltKeyDown() and GetMouseFoci() == self then
 		OnEnter(self)
 	end
 end

ElvUI/Mainline/Modules/Load_Modules.xml

@@ -4,6 +4,6 @@
 	<Include file='DataBars\Load_DataBars.xml'/>
 	<Include file='ActionBars\Load_ActionBars.xml'/>
 	<Include file='Misc\Load_Misc.xml'/>
-	<Include file='Skins\Load_Skins.xml'/>
+	<!-- <Include file='Skins\Load_Skins.xml'/> -->
 	<Include file='Blizzard\Load_Blizzard.xml'/>
 </Ui>

ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua

@@ -13,6 +13,9 @@ local type, error, tostring, tonumber, assert, select = type, error, tostring, t
 local setmetatable, wipe, unpack, pairs, ipairs, next, pcall = setmetatable, wipe, unpack, pairs, ipairs, next, pcall
 local str_match, format, tinsert, tremove, strsub = string.match, format, tinsert, tremove, strsub
 
+local GetMouseFocus = GetMouseFoci or GetMouseFocus
+local GetSpellInfo = (C_Spell and C_Spell.GetSpellInfo) or GetSpellInfo
+
 local WoWRetail = (WOW_PROJECT_ID == WOW_PROJECT_MAINLINE)
 local WoWClassic = (WOW_PROJECT_ID == WOW_PROJECT_CLASSIC)
 local WoWBCC = (WOW_PROJECT_ID == WOW_PROJECT_BURNING_CRUSADE_CLASSIC)

ElvUI_Libraries/Core/oUF_Plugins/oUF_Fader.lua

@@ -11,7 +11,7 @@ local pairs, ipairs, type = pairs, ipairs, type
 local next, tinsert, tremove = next, tinsert, tremove
 
 local CreateFrame = CreateFrame
-local GetMouseFocus = GetMouseFocus
+local GetMouseFocus = GetMouseFoci or GetMouseFocus
 local GetInstanceInfo = GetInstanceInfo
 local UnitAffectingCombat = UnitAffectingCombat
 local UnitCastingInfo = UnitCastingInfo