From 0408d45733c09385f78dee190f5fe93e851e7e56 Mon Sep 17 00:00:00 2001
From: Steven Jackson <failcoder@gmail.com>
Date: Sun, 30 Nov 2014 02:43:06 -0600
Subject: [PATCH] 5.2.999

---
 .../AddOns/SVUI/framework/movers/mover_mentalo.lua |    9 +--
 .../libs/LibSuperVillain-1.0/modules/Registry.lua  |    3 +-
 Interface/AddOns/SVUI/scripts/_load.xml            |    2 +-
 Interface/AddOns/SVUI/system/alerts.lua            |    2 +-
 .../components/blizzard/spellbook.lua              |   67 +++++++++-----------
 5 files changed, 35 insertions(+), 48 deletions(-)

diff --git a/Interface/AddOns/SVUI/framework/movers/mover_mentalo.lua b/Interface/AddOns/SVUI/framework/movers/mover_mentalo.lua
index 7002af5..b3aa26a 100644
--- a/Interface/AddOns/SVUI/framework/movers/mover_mentalo.lua
+++ b/Interface/AddOns/SVUI/framework/movers/mover_mentalo.lua
@@ -708,18 +708,11 @@ function Mentalo:Reset(request)
 		end
 	elseif(request == "Blizzard") then
 		for frameName, point in pairs(self.Blizzard) do 
-			local frame = _G[frameName];
-			if(frame) then
-				if(point and (type(point) == "string")) then
-					local u, v, w, x, y = split("\031", point)
-					frame:ClearAllPoints()
-					frame:SetPoint(u, v, w, x, y)
-				end
-			end
 			if(SV.cache.Anchors and SV.cache.Anchors[frameName]) then 
 				SV.cache.Anchors[frameName] = nil 
 			end
 		end
+		ReloadUI()
 	else 
 		for frameName, frameData in pairs(self.Frames) do
 			if(frameData.point and (request == frameData.text)) then
diff --git a/Interface/AddOns/SVUI/libs/LibSuperVillain-1.0/modules/Registry.lua b/Interface/AddOns/SVUI/libs/LibSuperVillain-1.0/modules/Registry.lua
index ed74a6d..acb6d1d 100644
--- a/Interface/AddOns/SVUI/libs/LibSuperVillain-1.0/modules/Registry.lua
+++ b/Interface/AddOns/SVUI/libs/LibSuperVillain-1.0/modules/Registry.lua
@@ -738,7 +738,8 @@ function lib:LoadQueuedPlugins()
             if(obj and enabled and (not obj.initialized)) then
                 local halt = false
 
-                if(files.PROFILE and _G[files.PROFILE]) then
+                if(files.PROFILE) then
+                    if not _G[files.PROFILE] then _G[files.PROFILE] = {} end
                     local db = setmetatable({}, meta_transdata)
                     db.data = _G[files.PROFILE]
                     db.defaults = obj.defaults
diff --git a/Interface/AddOns/SVUI/scripts/_load.xml b/Interface/AddOns/SVUI/scripts/_load.xml
index 4acfca5..4f0300f 100644
--- a/Interface/AddOns/SVUI/scripts/_load.xml
+++ b/Interface/AddOns/SVUI/scripts/_load.xml
@@ -2,5 +2,5 @@
 	<Script file="misc.lua"/>
     <Script file="mounts.lua"/>
     <Script file="reactions.lua"/>
-    <Script file="spellbind.lua"/>
+    <!-- <Script file="spellbind.lua"/> -->
 </Ui>
\ No newline at end of file
diff --git a/Interface/AddOns/SVUI/system/alerts.lua b/Interface/AddOns/SVUI/system/alerts.lua
index d43484e..1e588fb 100644
--- a/Interface/AddOns/SVUI/system/alerts.lua
+++ b/Interface/AddOns/SVUI/system/alerts.lua
@@ -198,7 +198,7 @@ SV.SystemAlert["RESETMENTALO_CHECK"] = {
 	whileDead = 1
 };
 SV.SystemAlert["RESETBLIZZARD_CHECK"] = {
-	text = L["Are you sure you want to all draggable Blizzard frames to their original positions?"], 
+	text = L["Are you sure you want to all draggable Blizzard frames to their original positions? This will reload your UI."], 
 	button1 = ACCEPT, 
 	button2 = CANCEL, 
 	OnAccept = function(a)SV.Mentalo:Reset("Blizzard")end, 
diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/spellbook.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/spellbook.lua
index 0651929..dae16ab 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/spellbook.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/spellbook.lua
@@ -162,44 +162,37 @@ local function ButtonUpdateHelper()
 		local name = "SpellButton"..i;
 		local button = _G[name];
 
-		if(button) then
-			if(not button.Panel) then
-				local icon = _G[name.."IconTexture"]
-				local spellString = _G[name.."SpellName"];
-		    	local subSpellString = _G[name.."SubSpellName"];
-		    	--local highlight = _G[name.."Highlight"];
-
-				if(not InCombatLockdown()) then
-					 button:SetFrameLevel(SpellBookFrame:GetFrameLevel() + 5)
-				end 
+		if(button and (not button.Panel)) then
+			local icon = _G[name.."IconTexture"]
+			local spellString = _G[name.."SpellName"];
+	    	local subSpellString = _G[name.."SubSpellName"];
+	    	--local highlight = _G[name.."Highlight"];
+
+			if(not InCombatLockdown()) then
+				 button:SetFrameLevel(SpellBookFrame:GetFrameLevel() + 5)
+			end 
+
+			button:RemoveTextures() 
+			button:SetPanelTemplate("Slot", true, 2, 0, 0)
+
+			if(icon) then
+				icon:SetTexCoord(0.1, 0.9, 0.1, 0.9)
+				icon:ClearAllPoints()
+				icon:FillInner(button, 1, 1)
+			end
+
+			if(spellString) then 
+				spellString:SetFontObject(NumberFontNormal) 
+				spellString:SetTextColor(1,1,0) 
+			end
+
+			if(subSpellString) then 
+				subSpellString:SetFontObject(NumberFont_Shadow_Small) 
+				subSpellString:SetTextColor(0.9,0.9,0.9) 
+			end
 
-				button:RemoveTextures() 
-				button:SetPanelTemplate("Slot", true, 2, 0, 0)
-
-				if(icon) then
-					icon:SetTexCoord(0.1, 0.9, 0.1, 0.9)
-					icon:ClearAllPoints()
-					icon:FillInner(button, 1, 1)
-					-- if(highlight) then
-					-- 	highlight:SetTexture(1, 1, 1, 0.3)
-					-- 	highlight:ClearAllPoints()
-					-- 	highlight:FillInner(button, 1, 1)
-					-- end
-				end
-
-				if(spellString) then 
-					spellString:SetFontObject(NumberFontNormal) 
-					spellString:SetTextColor(1,1,0) 
-				end
-
-				if(subSpellString) then 
-					subSpellString:SetFontObject(NumberFont_Shadow_Small) 
-					subSpellString:SetTextColor(0.9,0.9,0.9) 
-				end
-
-				if(button.FlyoutArrow) then
-					button.FlyoutArrow:SetTexture([[Interface\Buttons\ActionBarFlyoutButton]])
-				end
+			if(button.FlyoutArrow) then
+				button.FlyoutArrow:SetTexture([[Interface\Buttons\ActionBarFlyoutButton]])
 			end
 		end
 	end 
-- 
1.7.9.5