Mercurial > wow > worldplan

diff ClassPlanShipments.lua @ 95:b29b35cb8539

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- Fixed quest completion checking and handling - Changed animation method to hopefully stop weird flickering. - Pins are now visible before full reward data is loaded - Filter bar redesigned: - aligned horizontally along the top of the map display - filter buttons display a '+' when there are matches in both current and other zones, and '*' when there only matches in other zones - button tooltips separate local and global quests - button categories are highlighted and labeled when the cursor is over them - Fixed invalid POI targets appearing when the spell targeting cursor is active - ClassOrderPlan can be closed with the game menu button
author Nenue
date Mon, 08 May 2017 22:38:52 -0400
parents 589c444d4837
children 4d1520186ea4
line wrap: on
line diff
--- a/ClassPlanShipments.lua	Sat Apr 15 11:05:32 2017 -0400
+++ b/ClassPlanShipments.lua	Mon May 08 22:38:52 2017 -0400
@@ -209,39 +209,42 @@
 
 
 ShipmentList.SortHandler = function(a, b)
-  if a[SortKey]  then
-    if b[SortKey] then
-      return SortTable[a[SortKey]] < SortTable[b[SortKey]]
-    else
-      return true
+  local status = false
+  if b.isComplete ~= a.isComplete then
+    if a.isComplete then
+      status = true
     end
   else
-    if b.isComplete ~= a.isComplete then
-      return a.isComplete and true or false
+    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
-        return a.profileKey < b.profileKey
+          status = (a.profileKey < b.profileKey)
+
       else
         if a.shipmentsReady and b.shipmentsReady then
-          return (a.shipmentsReady) > (b.shipmentsReady)
+          status =  (a.shipmentsReady) > (b.shipmentsReady)
         elseif a.shipmentsReady or b.shipmentsReady then
-          return (a.shipmentsReady) or true or false
+          status =  (a.shipmentsReady) or true or false
         else
 
           if (a.creationTime ~= b.creationTime) then
-            return (a.creationTime) < (b.creationTime)
+            status =  (a.creationTime) < (b.creationTime)
           else
-            return (a.name) < (b.name)
+            status =  (a.name) < (b.name)
           end
         end
 
       end
     end
   end
+  return status
 end
 
-function ShipmentList:OnLoad()
-end
 function  ShipmentList:OnShow()
   print('|cFF00FF88'..self:GetName()..':OnShow()|r')
 end