From 1ff01c10f17b7a82bb6343a8f9b3a0cc2c743e51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Jastrz=C4=99bski?= Date: Fri, 14 Dec 2018 08:02:47 +0100 Subject: [PATCH] Bumped TOC --- .pkgmeta | 2 +- REFlex.lua | 6 +++--- REFlex.toc | 4 ++-- REFlexFunctions.lua | 5 +++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.pkgmeta b/.pkgmeta index 6675de4..7e2f9e6 100644 --- a/.pkgmeta +++ b/.pkgmeta @@ -3,7 +3,7 @@ enable-nolib-creation: no externals: Libs/LibStub: https://repos.wowace.com/wow/ace3/trunk/LibStub Libs/CallbackHandler-1.0: https://repos.wowace.com/wow/ace3/trunk/CallbackHandler-1.0 - Libs/LibScrollingTable: https://repos.wowace.com/wow/lib-st/trunk + Libs/LibScrollingTable: https://github.com/ddumont/lib-st.git Libs/LibQTip-1.0: https://repos.wowace.com/wow/libqtip-1-0/trunk Libs/LibDataBroker-1.1: https://repos.wowace.com/wow/libdatabroker-1-1 Libs/LibDBIcon-1.0: https://repos.wowace.com/wow/libdbicon-1-0/trunk/LibDBIcon-1.0 diff --git a/REFlex.lua b/REFlex.lua index f0247d2..36ad5f2 100644 --- a/REFlex.lua +++ b/REFlex.lua @@ -99,7 +99,7 @@ local RegisterAddonMessagePrefix = _G.C_ChatInfo.RegisterAddonMessagePrefix local SendAddonMessage = _G.C_ChatInfo.SendAddonMessage local ElvUI = _G.ElvUI -RE.Version = 261 +RE.Version = 262 RE.LastSquash = 1531828800 RE.FoundNewVersion = false @@ -697,7 +697,7 @@ function RE:UpdateGUI() end end if #RE.TableBG.data == 0 then - RE.TableBG.cols[1].sort = "asc" + RE.TableBG.cols[1].sort = ST.SORT_ASC end RE.TableBG:SetData(RE.BGData, true) if PanelTemplates_GetSelectedTab(_G.REFlexFrame) == 1 then @@ -744,7 +744,7 @@ function RE:UpdateGUI() end end if #RE.TableArena.data == 0 then - RE.TableArena.cols[1].sort = "asc" + RE.TableArena.cols[1].sort = ST.SORT_ASC end RE.TableArena:SetData(RE.ArenaData, true) if PanelTemplates_GetSelectedTab(_G.REFlexFrame) == 4 then diff --git a/REFlex.toc b/REFlex.toc index 3c8b162..7eef75b 100644 --- a/REFlex.toc +++ b/REFlex.toc @@ -1,7 +1,7 @@ -## Interface: 80000 +## Interface: 80100 ## Title: |cFF74D06CRE|rFlex ## Notes: Collect statistics of played arena matches and battlegrounds. -## Version: 2.6.1 +## Version: 2.6.2 ## Author: AcidWeb ## SavedVariablesPerCharacter: REFlexSettings, REFlexDatabase, REFlexHonorDatabase ## X-Website: https://www.curseforge.com/wow/addons/reflex-battleground-historian diff --git a/REFlexFunctions.lua b/REFlexFunctions.lua index 4af0c14..2e8614a 100644 --- a/REFlexFunctions.lua +++ b/REFlexFunctions.lua @@ -4,6 +4,7 @@ local L = LibStub("AceLocale-3.0"):GetLocale("REFlex") local BR = LibStub("LibBabble-Race-3.0"):GetReverseLookupTable() local DUMP = LibStub("LibTextDump-1.0") local TOAST = LibStub("LibToast-1.0") +local ST = LibStub("ScrollingTable") --GLOBALS: CLASS_ICON_TCOORDS, RAID_CLASS_COLORS, LOCALIZED_CLASS_NAMES_MALE local tinsert, tsort, tconcat, tremove = _G.table.insert, _G.table.sort, _G.table.concat, _G.table.remove @@ -515,7 +516,7 @@ end function RE:CustomSort(obj, rowa, rowb, sortbycol, field, inside) local column = obj.cols[sortbycol] - local direction = column.sort or column.defaultsort or "asc" + local direction = column.sort or column.defaultsort or ST.SORT_ASC local rowA, rowB if inside > 0 then rowA = obj.data[rowa][inside] @@ -527,7 +528,7 @@ function RE:CustomSort(obj, rowa, rowb, sortbycol, field, inside) if rowA == rowB then return false else - if direction:lower() == "asc" then + if direction == ST.SORT_ASC then return rowA > rowB else return rowA < rowB