Merge pull request #68 from ElvUI-Vanilla/dev

Dev
This commit is contained in:
Crum
2018-11-26 19:19:47 -06:00
committed by GitHub
7 changed files with 14 additions and 9 deletions
+1
View File
@@ -500,6 +500,7 @@ function EditBoxSetCursorPosition(self, pos)
text = sub(text, 0, 1) text = sub(text, 0, 1)
self:HighlightText(0, 1) self:HighlightText(0, 1)
self:Insert(nbsp)
self:Insert(text) self:Insert(text)
self:HighlightText(0, 1) self:HighlightText(0, 1)
self:Insert("") self:Insert("")
+2 -2
View File
@@ -495,12 +495,12 @@ function EventTraceFrameEventHideButton_OnClick (button)
EventTraceFrame_Update(); EventTraceFrame_Update();
end end
local ERROR_FORMAT = [[||cffffd200Message:|r|cffffffff %s|r local ERROR_FORMAT = [[|cffffd200Message:|r|cffffffff %s|r
|cffffd200Time:|r|cffffffff %s|r |cffffd200Time:|r|cffffffff %s|r
|cffffd200Count:|r|cffffffff %s|r |cffffd200Count:|r|cffffffff %s|r
|cffffd200Stack:|r|cffffffff %s|r]]; |cffffd200Stack:|r|cffffffff %s|r]];
local WARNING_AS_ERROR_FORMAT = [[||cffffd200Message:|r|cffffffff %s|r local WARNING_AS_ERROR_FORMAT = [[|cffffd200Message:|r|cffffffff %s|r
|cffffd200Time:|r|cffffffff %s|r |cffffd200Time:|r|cffffffff %s|r
|cffffd200Count:|r|cffffffff %s|r]]; |cffffd200Count:|r|cffffffff %s|r]];
@@ -149,6 +149,10 @@ end
--gets an option from a given group, checking plugins --gets an option from a given group, checking plugins
local function GetSubOption(group, key) local function GetSubOption(group, key)
if type(key) == "table" then
key = key[1]
end
if group.plugins then if group.plugins then
for plugin, t in pairs(group.plugins) do for plugin, t in pairs(group.plugins) do
if t[key] then if t[key] then
@@ -74,7 +74,7 @@ Constructor
-------------------------------------------------------------------------------]] -------------------------------------------------------------------------------]]
local function Constructor() local function Constructor()
local name = "AceGUI30Button" .. AceGUI:GetNextWidgetNum(Type) local name = "AceGUI30Button" .. AceGUI:GetNextWidgetNum(Type)
local frame = CreateFrame("Button", name, UIParent, "UIPanelButtonTemplate") local frame = CreateFrame("Button", name, UIParent, "UIPanelButtonTemplate2")
frame:Hide() frame:Hide()
frame:EnableMouse(true) frame:EnableMouse(true)
@@ -64,9 +64,9 @@ if not AceGUIEditBoxInsertLink then
hooksecurefunc("SetItemRef", function(link, text, button) hooksecurefunc("SetItemRef", function(link, text, button)
if IsShiftKeyDown() then if IsShiftKeyDown() then
if strsub(link,1,6) == "player" then if sub(link, 1, 6) == "player" then
local name = strsub(link,8) local name = sub(link, 8)
if name and (strlen(name) > 0) then if name and name ~= "" then
return _G.AceGUIEditBoxInsertLink(name) return _G.AceGUIEditBoxInsertLink(name)
end end
else else
@@ -116,7 +116,7 @@ if not AceGUIEditBoxInsertLink then
if id <= MAX_SPELLS and (not drag) and IsShiftKeyDown() then if id <= MAX_SPELLS and (not drag) and IsShiftKeyDown() then
local spellName, subSpellName = GetSpellName(id, SpellBookFrame.bookType) local spellName, subSpellName = GetSpellName(id, SpellBookFrame.bookType)
if spellName and not IsSpellPassive(id, SpellBookFrame.bookType) then if spellName and not IsSpellPassive(id, SpellBookFrame.bookType) then
if subSpellName and (strlen(subSpellName) > 0) then if subSpellName and subSpellName ~= "" then
_G.AceGUIEditBoxInsertLink(spellName.."("..subSpellName..")") _G.AceGUIEditBoxInsertLink(spellName.."("..subSpellName..")")
else else
_G.AceGUIEditBoxInsertLink(spellName) _G.AceGUIEditBoxInsertLink(spellName)
@@ -192,7 +192,7 @@ local function Constructor()
local name = "AceGUI30KeybindingButton" .. AceGUI:GetNextWidgetNum(Type) local name = "AceGUI30KeybindingButton" .. AceGUI:GetNextWidgetNum(Type)
local frame = CreateFrame("Frame", nil, UIParent) local frame = CreateFrame("Frame", nil, UIParent)
local button = CreateFrame("Button", name, frame, "UIPanelButtonTemplate") local button = CreateFrame("Button", name, frame, "UIPanelButtonTemplate2")
button:EnableMouse(true) button:EnableMouse(true)
button:EnableMouseWheel(false) button:EnableMouseWheel(false)
@@ -113,7 +113,7 @@ if not AceGUIMultiLineEditBoxInsertLink then
if id <= MAX_SPELLS and (not drag) and IsShiftKeyDown() then if id <= MAX_SPELLS and (not drag) and IsShiftKeyDown() then
local spellName, subSpellName = GetSpellName(id, SpellBookFrame.bookType) local spellName, subSpellName = GetSpellName(id, SpellBookFrame.bookType)
if spellName and not IsSpellPassive(id, SpellBookFrame.bookType) then if spellName and not IsSpellPassive(id, SpellBookFrame.bookType) then
if subSpellName and (strlen(subSpellName) > 0) then if subSpellName and subSpellName ~= "" then
_G.AceGUIMultiLineEditBoxInsertLink(spellName.."("..subSpellName..")") _G.AceGUIMultiLineEditBoxInsertLink(spellName.."("..subSpellName..")")
else else
_G.AceGUIMultiLineEditBoxInsertLink(spellName) _G.AceGUIMultiLineEditBoxInsertLink(spellName)