Skip to content

Commit

Permalink
Whitespace cleanups
Browse files Browse the repository at this point in the history
  • Loading branch information
Stanzilla committed Jul 27, 2017
1 parent 27afb85 commit 83717c9
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 27 deletions.
5 changes: 1 addition & 4 deletions WeakAuras/BuffTrigger.lua
Original file line number Diff line number Diff line change
Expand Up @@ -807,7 +807,6 @@ end);

do
local pendingTracks = {};

local UIDsfromGUID = {};
local GUIDfromUID = {};

Expand Down Expand Up @@ -933,7 +932,6 @@ do
return false;
end


local function updateSpell(spellName, unit, destGUID)
if (not loaded_auras[spellName]) then return end;
for id, triggers in pairs(loaded_auras[spellName]) do
Expand Down Expand Up @@ -1308,7 +1306,7 @@ function BuffTrigger.Add(data)
auras[id] = nil;

for triggernum=0,(data.numTriggers or 9) do
local trigger, untrigger;
local trigger, untrigger; -- luacheck: ignore
if(triggernum == 0) then
trigger = data.trigger;
data.untrigger = data.untrigger or {};
Expand Down Expand Up @@ -1505,7 +1503,6 @@ function BuffTrigger.CanHaveAuto(data, triggernum)
return false;
end


--- Returns whether the trigger can have clones.
-- @param data
-- @param triggernum
Expand Down
3 changes: 1 addition & 2 deletions WeakAuras/GenericTrigger.lua
Original file line number Diff line number Diff line change
Expand Up @@ -911,7 +911,6 @@ do
end
end


local combatLogUpgrade = {
["sourceunit"] = "sourceUnit",
["source"] = "sourceName",
Expand Down Expand Up @@ -2180,13 +2179,13 @@ do
scheduled_scans[fireTime] = nil;
WeakAuras.ScanEvents("BigWigs_Timer_Update");
end

function WeakAuras.ScheduleBigWigsCheck(fireTime)
if not(scheduled_scans[fireTime]) then
scheduled_scans[fireTime] = timer:ScheduleTimer(doBigWigsScan, fireTime - GetTime() + 0.1, fireTime);
WeakAuras.debug("Scheduled BigWigs scan at "..fireTime);
end
end

end

-- Weapon Enchants
Expand Down
8 changes: 3 additions & 5 deletions WeakAuras/Prototypes.lua
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ local GetSpellInfo, GetItemInfo, GetItemCount, GetItemIcon = GetSpellInfo, GetIt
local GetShapeshiftFormInfo, GetShapeshiftForm = GetShapeshiftFormInfo, GetShapeshiftForm
local GetRuneCooldown, UnitCastingInfo, UnitChannelInfo = GetRuneCooldown, UnitCastingInfo, UnitChannelInfo

local WeakAuras = WeakAuras;
local L = WeakAuras.L;
local WeakAuras = WeakAuras
local L = WeakAuras.L

local SpellRange = LibStub("SpellRange-1.0")
function WeakAuras.IsSpellInRange(spellId, unit)
return SpellRange.IsSpellInRange(spellId, unit);
return SpellRange.IsSpellInRange(spellId, unit)
end

WeakAuras.encounter_table = {
Expand Down Expand Up @@ -469,14 +469,12 @@ function WeakAuras.CheckPvpTalentByIndex(index)
return selected
end


function WeakAuras.CheckNumericIds(loadids, currentId)
if (not loadids or not currentId) then
return false;
end

local searchFrom = 0;

local startI, endI = string.find(loadids, currentId, searchFrom);
while (startI) do
searchFrom = endI + 1; -- start next search from end
Expand Down
1 change: 0 additions & 1 deletion WeakAuras/RegionTypes/ProgressTexture.lua
Original file line number Diff line number Diff line change
Expand Up @@ -703,7 +703,6 @@ local function create(parent)
return 0, 1;
end


region.expirationTime = math.huge;

region.SetOrientation = SetOrientation;
Expand Down
15 changes: 3 additions & 12 deletions WeakAuras/WeakAuras.lua
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,6 @@ function WeakAuras.GetActiveConditions(id, cloneId)
return triggerState[id].activatedConditions[cloneId];
end


local function formatValueForAssignment(vtype, value, pathToCustomFunction)
if (value == nil) then
value = false;
Expand Down Expand Up @@ -760,6 +759,7 @@ local function CreateDeactivateCondition(ret, condition, conditionNumber, data,
end
ret = ret .. " end\n"
end

return ret;
end

Expand Down Expand Up @@ -814,7 +814,6 @@ local function CreateActivateCondition(ret, id, condition, conditionNumber, prop
return ret;
end


function WeakAuras.LoadCustomActionFunctions(data)
local id = data.id;
WeakAuras.customActionsFunctions[id] = {};
Expand Down Expand Up @@ -848,7 +847,6 @@ function WeakAuras.LoadCustomActionFunctions(data)
WeakAuras.customActionsFunctions[id]["finish_message"] = func;
end
end

end
end

Expand Down Expand Up @@ -948,8 +946,6 @@ function WeakAuras.ConstructConditionFunction(data)
end
ret = ret .. "end\n";

--print(ret);

return ret;
end

Expand Down Expand Up @@ -1119,7 +1115,6 @@ function WeakAuras.ResumeAllDynamicGroups()
end

function WeakAuras.ScanAll()

WeakAuras.PauseAllDynamicGroups();

for id, region in pairs(regions) do
Expand All @@ -1133,7 +1128,6 @@ function WeakAuras.ScanAll()
end

WeakAuras.ResumeAllDynamicGroups();

WeakAuras.ReloadAll();

for _, triggerSystem in pairs(triggerSystems) do
Expand Down Expand Up @@ -1652,7 +1646,6 @@ function WeakAuras.Rename(data, newid)
triggerState[newid] = triggerState[oldid];
triggerState[oldid] = nil;


db.displays[newid] = db.displays[oldid];
db.displays[oldid] = nil;

Expand Down Expand Up @@ -1970,9 +1963,11 @@ function WeakAuras.Modernize(data)
["Warlock"] = "WARLOCK",
["Warrior"] = "WARRIOR"
};

if(load.class.single) then
load.class.single = class_agnosticize[load.class.single] or load.class.single;
end

if(load.class.multi) then
for i,v in pairs(load.class.multi) do
if(class_agnosticize[i]) then
Expand All @@ -1989,7 +1984,6 @@ function WeakAuras.Modernize(data)
data.displayTextRight = data.displayTextRight or "%p";
end


if(data.regionType == "icon") then
if (data.cooldownTextEnabled == nil) then
data.cooldownTextEnabled = true;
Expand Down Expand Up @@ -2143,7 +2137,6 @@ function WeakAuras.Modernize(data)
ModernizeAnimations(data.animation and data.animation.start);
ModernizeAnimations(data.animation and data.animation.main);
ModernizeAnimations(data.animation and data.animation.finish);

end

function WeakAuras.SyncParentChildRelationships(silent)
Expand Down Expand Up @@ -3123,7 +3116,6 @@ function WeakAuras.CorrectItemName(input)
end
end


local currentTooltipRegion;
local currentTooltipOwner;
function WeakAuras.UpdateMouseoverTooltip(region)
Expand Down Expand Up @@ -3767,7 +3759,6 @@ function WeakAuras.UpdatedTriggerState(id)
end
end


for triggernum = 0, triggerState[id].numTriggers - 1 do
triggerState[id][triggernum] = triggerState[id][triggernum] or {};
for cloneId, state in pairs(triggerState[id][triggernum]) do
Expand Down
3 changes: 0 additions & 3 deletions WeakAurasOptions/WeakAurasOptions.lua
Original file line number Diff line number Diff line change
Expand Up @@ -950,7 +950,6 @@ function WeakAuras.ConstructOptions(prototype, data, startorder, subPrefix, subS
end

local frame;

local db;
local odb;
local options;
Expand Down Expand Up @@ -2027,7 +2026,6 @@ local function replaceValuesFuncs(intable, data)
recurse(intable);
end


function WeakAuras.AddOption(id, data)
local regionOption;
if(regionOptions[data.regionType]) then
Expand Down Expand Up @@ -2558,7 +2556,6 @@ function WeakAuras.AddOption(id, data)
end

local custom = data.actions.finish.message_custom;

if (not custom) then
return true;
end
Expand Down

0 comments on commit 83717c9

Please sign in to comment.