changeset 107:b2be2de2b133

live branch cleanup
author Nenue
date Sun, 28 May 2017 20:16:05 -0400
parents 1197c8825eda
children b67ba1078824
files ClassPlan.lua ClassPlanShipments.lua
diffstat 2 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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)