From cd7576e8c095ac7a9e81dc4c28f43d9372b094f7 Mon Sep 17 00:00:00 2001 From: Pinya <800pin.ru@gmail.com> Date: Tue, 27 Nov 2018 02:41:14 +0300 Subject: [PATCH 1/4] Revert "fix lua error "Message:" color" This reverts commit 500bb5ea386da104b18fb5b74a75e24b7a7db69a. --- !DebugTools/Blizzard_DebugTools.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/!DebugTools/Blizzard_DebugTools.lua b/!DebugTools/Blizzard_DebugTools.lua index 1d2ad5d..131435b 100644 --- a/!DebugTools/Blizzard_DebugTools.lua +++ b/!DebugTools/Blizzard_DebugTools.lua @@ -495,12 +495,12 @@ function EventTraceFrameEventHideButton_OnClick (button) EventTraceFrame_Update(); end -local ERROR_FORMAT = [[||cffffd200Message:|r|cffffffff %s|r +local ERROR_FORMAT = [[|cffffd200Message:|r|cffffffff %s|r |cffffd200Time:|r|cffffffff %s|r |cffffd200Count:|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 |cffffd200Count:|r|cffffffff %s|r]]; From 2397cf0cbd5210a1648be3f622a68da9f5f93146 Mon Sep 17 00:00:00 2001 From: Pinya <800pin.ru@gmail.com> Date: Tue, 27 Nov 2018 02:49:07 +0300 Subject: [PATCH 2/4] ^_^ --- .../Libraries/AceGUI-3.0/widgets/AceGUIWidget-Button.lua | 2 +- .../Libraries/AceGUI-3.0/widgets/AceGUIWidget-EditBox.lua | 8 ++++---- .../AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua | 2 +- .../AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ElvUI_Config/Libraries/AceGUI-3.0/widgets/AceGUIWidget-Button.lua b/ElvUI_Config/Libraries/AceGUI-3.0/widgets/AceGUIWidget-Button.lua index 97d379e..8d1eca9 100644 --- a/ElvUI_Config/Libraries/AceGUI-3.0/widgets/AceGUIWidget-Button.lua +++ b/ElvUI_Config/Libraries/AceGUI-3.0/widgets/AceGUIWidget-Button.lua @@ -74,7 +74,7 @@ Constructor -------------------------------------------------------------------------------]] local function Constructor() local name = "AceGUI30Button" .. AceGUI:GetNextWidgetNum(Type) - local frame = CreateFrame("Button", name, UIParent, "UIPanelButtonTemplate") + local frame = CreateFrame("Button", name, UIParent, "UIPanelButtonTemplate2") frame:Hide() frame:EnableMouse(true) diff --git a/ElvUI_Config/Libraries/AceGUI-3.0/widgets/AceGUIWidget-EditBox.lua b/ElvUI_Config/Libraries/AceGUI-3.0/widgets/AceGUIWidget-EditBox.lua index d94dc74..78c47c8 100644 --- a/ElvUI_Config/Libraries/AceGUI-3.0/widgets/AceGUIWidget-EditBox.lua +++ b/ElvUI_Config/Libraries/AceGUI-3.0/widgets/AceGUIWidget-EditBox.lua @@ -64,9 +64,9 @@ if not AceGUIEditBoxInsertLink then hooksecurefunc("SetItemRef", function(link, text, button) if IsShiftKeyDown() then - if strsub(link,1,6) == "player" then - local name = strsub(link,8) - if name and (strlen(name) > 0) then + if sub(link, 1, 6) == "player" then + local name = sub(link, 8) + if name and name ~= "" then return _G.AceGUIEditBoxInsertLink(name) end else @@ -116,7 +116,7 @@ if not AceGUIEditBoxInsertLink then if id <= MAX_SPELLS and (not drag) and IsShiftKeyDown() then local spellName, subSpellName = GetSpellName(id, SpellBookFrame.bookType) 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..")") else _G.AceGUIEditBoxInsertLink(spellName) diff --git a/ElvUI_Config/Libraries/AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua b/ElvUI_Config/Libraries/AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua index 72f4536..ff061d1 100644 --- a/ElvUI_Config/Libraries/AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua +++ b/ElvUI_Config/Libraries/AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua @@ -192,7 +192,7 @@ local function Constructor() local name = "AceGUI30KeybindingButton" .. AceGUI:GetNextWidgetNum(Type) local frame = CreateFrame("Frame", nil, UIParent) - local button = CreateFrame("Button", name, frame, "UIPanelButtonTemplate") + local button = CreateFrame("Button", name, frame, "UIPanelButtonTemplate2") button:EnableMouse(true) button:EnableMouseWheel(false) diff --git a/ElvUI_Config/Libraries/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua b/ElvUI_Config/Libraries/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua index 0f8e516..1ff4b1a 100644 --- a/ElvUI_Config/Libraries/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua +++ b/ElvUI_Config/Libraries/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua @@ -113,7 +113,7 @@ if not AceGUIMultiLineEditBoxInsertLink then if id <= MAX_SPELLS and (not drag) and IsShiftKeyDown() then local spellName, subSpellName = GetSpellName(id, SpellBookFrame.bookType) 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..")") else _G.AceGUIMultiLineEditBoxInsertLink(spellName) From 89d49f0153c1b09e655df2232bf941fcd77ced5e Mon Sep 17 00:00:00 2001 From: Pinya <800pin.ru@gmail.com> Date: Tue, 27 Nov 2018 02:50:54 +0300 Subject: [PATCH 3/4] i don't know why it's missing --- !Compatibility/api/wowAPI.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/!Compatibility/api/wowAPI.lua b/!Compatibility/api/wowAPI.lua index 98bebfd..e4cdb02 100644 --- a/!Compatibility/api/wowAPI.lua +++ b/!Compatibility/api/wowAPI.lua @@ -500,6 +500,7 @@ function EditBoxSetCursorPosition(self, pos) text = sub(text, 0, 1) self:HighlightText(0, 1) + self:Insert(nbsp) self:Insert(text) self:HighlightText(0, 1) self:Insert("") From 613f9da089d139c58e2d22847638ad683c7fbf98 Mon Sep 17 00:00:00 2001 From: Pinya <800pin.ru@gmail.com> Date: Tue, 27 Nov 2018 02:53:23 +0300 Subject: [PATCH 4/4] temp fix for userdata errors AceConfig #32 --- .../AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ElvUI_Config/Libraries/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua b/ElvUI_Config/Libraries/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua index 64b46aa..89f13e0 100644 --- a/ElvUI_Config/Libraries/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua +++ b/ElvUI_Config/Libraries/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua @@ -149,6 +149,10 @@ end --gets an option from a given group, checking plugins local function GetSubOption(group, key) + if type(key) == "table" then + key = key[1] + end + if group.plugins then for plugin, t in pairs(group.plugins) do if t[key] then