beta

WeakAurasOptions/OptionsFrames/FrameChooser.lua

@@ -13,15 +13,12 @@ local AceConfigDialog = LibStub("AceConfigDialog-3.0")
 local WeakAuras = WeakAuras
 local L = WeakAuras.L
 
-local valueFromPath = WeakAuras.ValueFromPath
-local valueToPath = WeakAuras.ValueToPath
-
 local frameChooserFrame
 local frameChooserBox
 
 local oldFocus
 local oldFocusName
-function WeakAuras.StartFrameChooser(data, path)
+function OptionsPrivate.StartFrameChooser(data, path)
   local frame = WeakAuras.OptionsFrame();
   if not(frameChooserFrame) then
     frameChooserFrame = CreateFrame("frame");
@@ -35,15 +32,15 @@ function WeakAuras.StartFrameChooser(data, path)
     frameChooserBox:SetBackdropBorderColor(0, 1, 0);
     frameChooserBox:Hide();
   end
-  local givenValue = valueFromPath(data, path);
+  local givenValue = OptionsPrivate.Private.ValueFromPath(data, path);
 
   frameChooserFrame:SetScript("OnUpdate", function()
     if(IsMouseButtonDown("RightButton")) then
-      valueToPath(data, path, givenValue);
-      WeakAuras.StopFrameChooser(data);
+      OptionsPrivate.Private.ValueToPath(data, path, givenValue);
+      OptionsPrivate.StopFrameChooser(data);
       WeakAuras.FillOptions()
     elseif(IsMouseButtonDown("LeftButton") and oldFocusName) then
-      WeakAuras.StopFrameChooser(data);
+      OptionsPrivate.StopFrameChooser(data);
     else
       SetCursor("CAST_CURSOR");
 
@@ -76,7 +73,7 @@ function WeakAuras.StartFrameChooser(data, path)
           end
 
           if(focusName ~= oldFocusName) then
-            valueToPath(data, path, focusName);
+            OptionsPrivate.Private.ValueToPath(data, path, focusName);
             oldFocusName = focusName;
             WeakAuras.FillOptions()
           end
@@ -91,7 +88,7 @@ function WeakAuras.StartFrameChooser(data, path)
   end);
 end
 
-function WeakAuras.StopFrameChooser(data)
+function OptionsPrivate.StopFrameChooser(data)
   if(frameChooserFrame) then
     frameChooserFrame:SetScript("OnUpdate", nil);
     frameChooserBox:Hide();