3f90dc3 - Remove most healabsorb, remove concatenation from event handlers

[wowui.git] / OmaUF / CastBar.lua

diff --git a/OmaUF/CastBar.lua b/OmaUF/CastBar.lua
index 61c107e..de2544e 100644 (file)
--- a/OmaUF/CastBar.lua
+++ b/OmaUF/CastBar.lua
@@ -38,6 +38,16 @@ local function onUpdate(bar)
     bar.time:SetFormattedText("%.1f", remaining);
 end
 
     bar.time:SetFormattedText("%.1f", remaining);
 end
 

+local function showBar(bar)
+    bar:Show();
+    bar:SetScript("OnUpdate", onUpdate);
+end
+
+local function hideBar(bar)
+    bar:Hide();
+    bar:SetScript("OnUpdate", nil);
+end
+

 local function toggleInterruptible(bar, nointr)
     if bar.unit == "player" then return end
     if nointr then
 local function toggleInterruptible(bar, nointr)
     if bar.unit == "player" then return end
     if nointr then


@@ -76,7 +86,7 @@ local function startCast(bar, unit, channeling)
     bar.spell:SetText(ssub(name, 1, bar.spell.count));
     bar.time:SetFormattedText("%.1f", (endTime - startTime)/1000);
     bar.cast:SetVertexColor(unpack(bar.cast.color));
     bar.spell:SetText(ssub(name, 1, bar.spell.count));
     bar.time:SetFormattedText("%.1f", (endTime - startTime)/1000);
     bar.cast:SetVertexColor(unpack(bar.cast.color));

-    bar:Show();
+    showBar(bar);

     toggleInterruptible(bar, noInterrupt);
     return true;
 end
     toggleInterruptible(bar, noInterrupt);
     return true;
 end


@@ -88,7 +98,7 @@ local function applyDelay(bar, unit, channeling)
     else
         _, _, _, _, startTime, endTime = UnitCastingInfo(unit);
     end
     else
         _, _, _, _, startTime, endTime = UnitCastingInfo(unit);
     end

-    if not startTime or not endTime then return bar:Hide() end
+    if not startTime or not endTime then return hideBar(bar) end

     bar.startTime = startTime / 1000;
     bar.endTime = endTime / 1000;
     -- TODO show delay text
     bar.startTime = startTime / 1000;
     bar.endTime = endTime / 1000;
     -- TODO show delay text


@@ -99,7 +109,7 @@ local events = {
         startCast(bar, unit);
     end,
     ["PLAYER_TARGET_CHANGED"] = function(bar)
         startCast(bar, unit);
     end,
     ["PLAYER_TARGET_CHANGED"] = function(bar)

-        bar:Hide();
+        hideBar(bar);

         if not startCast(bar, bar.unit) then
             startCast(bar, bar.unit, true);
         end
         if not startCast(bar, bar.unit) then
             startCast(bar, bar.unit, true);
         end


@@ -107,8 +117,8 @@ local events = {
     ["UNIT_SPELLCAST_CHANNEL_START"] = function(bar, unit)
         startCast(bar, unit, true);
     end,
     ["UNIT_SPELLCAST_CHANNEL_START"] = function(bar, unit)
         startCast(bar, unit, true);
     end,

-    ["UNIT_SPELLCAST_STOP"] = function(bar, unit)
-        bar:Hide();
+    ["UNIT_SPELLCAST_STOP"] = function(bar)
+        hideBar(bar);

     end,
     ["UNIT_SPELLCAST_DELAYED"] = function(bar, unit)
         applyDelay(bar, unit);
     end,
     ["UNIT_SPELLCAST_DELAYED"] = function(bar, unit)
         applyDelay(bar, unit);


@@ -127,7 +137,6 @@ events["UNIT_SPELLCAST_CHANNEL_STOP"] = events["UNIT_SPELLCAST_STOP"];
 
 local function onEvent(bar, event, unit)
     if unit == bar.unit or (bar.unit == "player" and unit == "vehicle") then
 
 local function onEvent(bar, event, unit)
     if unit == bar.unit or (bar.unit == "player" and unit == "vehicle") then

-        --print(unit, event)

         events[event](bar, unit);
     elseif event == "PLAYER_TARGET_CHANGED" then
         events[event](bar);
         events[event](bar, unit);
     elseif event == "PLAYER_TARGET_CHANGED" then
         events[event](bar);


@@ -147,7 +156,6 @@ function M.RegisterCastEvents(bar)
     bar:RegisterEvent("UNIT_SPELLCAST_INTERRUPTIBLE");
     bar:RegisterEvent("UNIT_SPELLCAST_NOT_INTERRUPTIBLE");
     if bar.unit == "target" then bar:RegisterEvent("PLAYER_TARGET_CHANGED") end
     bar:RegisterEvent("UNIT_SPELLCAST_INTERRUPTIBLE");
     bar:RegisterEvent("UNIT_SPELLCAST_NOT_INTERRUPTIBLE");
     if bar.unit == "target" then bar:RegisterEvent("PLAYER_TARGET_CHANGED") end

-    bar:SetScript("OnUpdate", onUpdate);

     -- trigger initial check
     if not startCast(bar, bar.unit) then
         startCast(bar, bar.unit, true);
     -- trigger initial check
     if not startCast(bar, bar.unit) then
         startCast(bar, bar.unit, true);


@@ -156,7 +164,6 @@ end
 
 function M.UnregisterCastEvents(bar)
     bar:UnregisterAllEvents();
 
 function M.UnregisterCastEvents(bar)
     bar:UnregisterAllEvents();

-    bar:SetScript("OnUpdate", nil);

 end
 
 function M.CreateCastBar(parent, unit, yoffset)
 end
 
 function M.CreateCastBar(parent, unit, yoffset)