# HG changeset patch # User Nenue # Date 1496016965 14400 # Node ID b2be2de2b1336f9d5a5ceda6cd7b14420e12ea0a # Parent 1197c8825eda699e3154926d5ac0eacda62fc8d5 live branch cleanup diff -r 1197c8825eda -r b2be2de2b133 ClassPlan.lua --- a/ClassPlan.lua Sun May 28 19:58:56 2017 -0400 +++ b/ClassPlan.lua Sun May 28 20:16:05 2017 -0400 @@ -117,7 +117,6 @@ print('FadeIn.OnPlay()') self.isAnimating = true self.data.IsShown = true - self:SetShown(true) end) self.FadeIn:SetScript('OnStop', OnStopped) @@ -321,6 +320,7 @@ else print('fade in') self.data.IsShown = true + self:SetShown(true) self.FadeIn:Play() end end diff -r 1197c8825eda -r b2be2de2b133 ClassPlanShipments.lua --- a/ClassPlanShipments.lua Sun May 28 19:58:56 2017 -0400 +++ b/ClassPlanShipments.lua Sun May 28 20:16:05 2017 -0400 @@ -210,18 +210,18 @@ ShipmentList.SortHandler = function(a, b) local status = false - if b.isComplete ~= a.isComplete then - if a.isComplete then + if b.isComplete ~= a.isComplete then + if a.isComplete then + status = true + end + else + if a[SortKey] then + if b[SortKey] then + status = (SortTable[a[SortKey]] < SortTable[b[SortKey]]) + else status = true end else - if a[SortKey] then - if b[SortKey] then - status = (SortTable[a[SortKey]] < SortTable[b[SortKey]]) - else - status = true - end - else if a.profileKey ~= b.profileKey then status = (a.profileKey < b.profileKey)