From bf7f9c407f4218251c8f5bd7b3d27ccc91e2f065 Mon Sep 17 00:00:00 2001 From: Munglunch Date: Mon, 28 Jul 2014 15:46:58 -0700 Subject: [PATCH] daily updates --- Interface/AddOns/SVUI/SVUI.lua | 12 +- Interface/AddOns/SVUI/SVUI.xml | 103 --- .../SVUI/assets/artwork/Chat/CHAT-SCROLL.blp | Bin 0 -> 6676 bytes .../SVUI/assets/artwork/Chat/CHAT-WHISPER.blp | Bin 0 -> 6676 bytes Interface/AddOns/SVUI/packages/aura/SVAura.lua | 2 +- .../AddOns/SVUI/packages/bag/tools/breakstuff.lua | 70 +- Interface/AddOns/SVUI/packages/chat/SVChat.lua | 91 ++- Interface/AddOns/SVUI/packages/dock/SVDock.lua | 21 +- .../AddOns/SVUI/packages/henchmen/SVHenchmen.lua | 20 +- .../SVUI/packages/laborer/modes/archaeology.lua | 6 +- Interface/AddOns/SVUI/packages/map/SVMap.lua | 4 +- .../AddOns/SVUI/packages/override/SVOverride.lua | 17 +- .../AddOns/SVUI/packages/stats/stats/guild.lua | 4 +- Interface/AddOns/SVUI/scripts/marker.lua | 139 ---- Interface/AddOns/SVUI/scripts/misc.lua | 710 +++++++++++++++++++- Interface/AddOns/SVUI/scripts/pvp.lua | 271 -------- Interface/AddOns/SVUI/scripts/threat.lua | 132 ---- Interface/AddOns/SVUI/scripts/totems.lua | 133 ---- Interface/AddOns/SVUI/system/alerts.lua | 6 +- Interface/AddOns/SVUI/system/database.lua | 2 +- Interface/AddOns/SVUI/system/utilities.lua | 32 +- .../SVUI_StyleOMatic/addons/thirdparty/BigWigs.lua | 7 +- .../SVUI_StyleOMatic/addons/thirdparty/DXE.lua | 10 +- .../addons/thirdparty/WeakAuras.lua | 2 +- Interface/BUTTONS/Thumbs.db | Bin 3072 -> 0 bytes Interface/GLUES/COMMON/Thumbs.db | Bin 12800 -> 0 bytes Interface/TAXIFRAME/Thumbs.db | Bin 156160 -> 0 bytes Interface/Tooltips/Thumbs.db | Bin 4096 -> 0 bytes 28 files changed, 912 insertions(+), 882 deletions(-) create mode 100644 Interface/AddOns/SVUI/assets/artwork/Chat/CHAT-SCROLL.blp create mode 100644 Interface/AddOns/SVUI/assets/artwork/Chat/CHAT-WHISPER.blp delete mode 100644 Interface/AddOns/SVUI/scripts/marker.lua delete mode 100644 Interface/AddOns/SVUI/scripts/pvp.lua delete mode 100644 Interface/AddOns/SVUI/scripts/threat.lua delete mode 100644 Interface/AddOns/SVUI/scripts/totems.lua delete mode 100644 Interface/BUTTONS/Thumbs.db delete mode 100644 Interface/GLUES/COMMON/Thumbs.db delete mode 100644 Interface/TAXIFRAME/Thumbs.db delete mode 100644 Interface/Tooltips/Thumbs.db diff --git a/Interface/AddOns/SVUI/SVUI.lua b/Interface/AddOns/SVUI/SVUI.lua index 3abcc5a..717c741 100644 --- a/Interface/AddOns/SVUI/SVUI.lua +++ b/Interface/AddOns/SVUI/SVUI.lua @@ -225,15 +225,17 @@ function table.copy(targetTable,deepCopy,mergeTable) end function string.trim(this) - return this:find'^%s*$' and '' or this:match'^%s*(.*%S)' + return this:find('^%s*$') and '' or this:match('^%s*(.*%S)') end -function string.color(this,color) - return "|cff"..color..this.."|r"; +function string.color(this, color) + return ("|cff%s%s|r"):format(color, this) end -function string.link(this,prefix,text,color) - return "|H"..prefix..":"..tostring(text).."|h"..tostring(this):color(color or"ffffff").."|h"; +function string.link(this, prefix, text, color) + text = tostring(text) + local colorstring = tostring(this):color(color or "ffffff") + return ("|H%s:%s|h%s|h"):format(prefix, text, colorstring) end --[[ ########################################################## diff --git a/Interface/AddOns/SVUI/SVUI.xml b/Interface/AddOns/SVUI/SVUI.xml index 5292260..99085a3 100644 --- a/Interface/AddOns/SVUI/SVUI.xml +++ b/Interface/AddOns/SVUI/SVUI.xml @@ -95,105 +95,6 @@ - -