Version 1.1.0

- split of messages preserves item links, textures, substitutions and raid target markers
- added safety measures to prevent endless replacement loops
- bumped version for Shadowlands
- bumped version for Naxxramas
- split of messages with excessive length no longer causes errors or broken texts
- proper handling of umlauts

.gitignore

@@ -1,124 +1,43 @@
-### Artifacts ###
+# Gradle
-# Compilation
+.gradle
+build/
+
+# Android built artifacts
+*.apk
+*.ap_
+*.dex
+
+# Java build artifacts class files
 *.class
 
-# Package Files
+# other generated files
-*.jar
+gen/
-*.war
-*.nar
-*.ear
-
-### Maven ###
-
-pom.xml.*
-release.properties
-dependency-reduced-pom.xml
-buildNumber.properties
-.mvn/timing.properties
-
 target/
-!.mvn/wrapper/maven-wrapper.jar
-!**/src/main/**/target/
-!**/src/test/**/target/
 
-### Java ###
+# local configuration file (for Android sdk path, etc)
+local.properties
 
-# Mobile Tools for Java (J2ME)
+# OSX files
-.mtj.tmp/
-
-# crash logs and heap dumps
-hs_err_pid*
-replay_pid*
-
-### Backup ###
-*.bak
-*.ori
-*.orig
-*.tmp
-*.zip
-*.tar.gz
-*.rar
-
-### CREDENTIALS ###
-
-**/secret
-
-### LOCAL-DEV ###
-*-local.xml
-*-local.yml
-*-local.yaml
-*-settings.*
-
-drivers/*.jar
-*.log
-
-### IntelliJ ###
-.idea/
-*.iws
-*.iml
-*.ipr
-out/
-!.idea/**/vcs.xml
-!.idea/**/encodings.xml
-
-### Eclipse ###
-.apt_generated
-.classpath
-.factorypath
-.metadata
-.project
-.classpath
-.settings/
-.springBeans
-.sts4-cache
-/bin/
-/tmp/
-*.swp
-*~.nib
-
-### NetBeans ###
-**/nbproject/*
-build/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### VS Code ###
-.vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
-!.vscode/*.code-snippets
-.history/
-*.vsix
-
-### Windows ###
-
-Thumbs.db
-[Dd]esktop.ini
-*.lnk
-
-### Linux ###
-*~
-.fuse_hidden*
-.directory
-.Trash-*
-.nfs*
-
-### MacOS ###
 .DS_Store
-.AppleDouble
-.LSOverride
 
-### AI harness ###
+# Eclipse
-.claude/
+/.classpath
-.codex/
+/.settings/
+/.project
+/.metadata
+bin/
 
-### Lokale Umgebung ###
+# IntelliJ
-.env
+*.iws
-.env.*
+*.uml
-!.env.example
+.idea/
+out/
+
+# NDK
+obj/
+
+# Misc
+.bin/
+*.log
+*.graphml
+coverage.db*

.pkgmeta

@@ -2,29 +2,23 @@ package-as: Grichelde
 
 enable-nolib-creation: no
 
-embedded-libraries:
+externals:
-  Libs/LibStub: https://repos.wowace.com/wow/libstub/tags/1.0
+  libs/LibStub: https://repos.wowace.com/wow/libstub/tags/1.0
-    curse-slug: libstub
+  libs/LibDataBroker: https://github.com/tekkub/libdatabroker-1-1
-  Libs/LibDataBroker: https://github.com/tekkub/libdatabroker-1-1
+  libs/LibDBIcon: https://repos.curseforge.com/wow/libdbicon-1-0/trunk/LibDBIcon-1.0
-    curse-slug: libdatabroker-1-1
+  libs/CallbackHandler-1.0: https://repos.wowace.com/wow/callbackhandler/trunk/CallbackHandler-1.0
-  Libs/LibDBIcon: https://repos.curseforge.com/wow/libdbicon-1-0/trunk/LibDBIcon-1.0
+  libs/AceAddon-3.0: https://repos.wowace.com/wow/ace3/trunk/AceAddon-3.0
-    curse-slug: libdbicon-1-0
+  libs/AceConfig-3.0: https://repos.wowace.com/wow/ace3/trunk/AceConfig-3.0
-  Libs/CallbackHandler-1.0: https://repos.wowace.com/wow/callbackhandler/trunk/CallbackHandler-1.0
+  libs/AceConsole-3.0: https://repos.wowace.com/wow/ace3/trunk/AceConsole-3.0
-    curse-slug: callbackhandler
+  libs/AceDB-3.0: https://repos.wowace.com/wow/ace3/trunk/AceDB-3.0
-  Libs/AceAddon-3.0: https://repos.wowace.com/wow/ace3/trunk/AceAddon-3.0
+  libs/AceDBOptions-3.0: https://repos.wowace.com/wow/ace3/trunk/AceDBOptions-3.0
-    curse-slug: ace3
+  libs/AceEvent-3.0: https://repos.wowace.com/wow/ace3/trunk/AceEvent-3.0
-  Libs/AceConfig-3.0: https://repos.wowace.com/wow/ace3/trunk/AceConfig-3.0
+  libs/AceGUI-3.0: https://repos.wowace.com/wow/ace3/trunk/AceGUI-3.0
-  Libs/AceConsole-3.0: https://repos.wowace.com/wow/ace3/trunk/AceConsole-3.0
+  libs/AceHook-3.0: https://repos.wowace.com/wow/ace3/trunk/AceHook-3.0
-  Libs/AceDB-3.0: https://repos.wowace.com/wow/ace3/trunk/AceDB-3.0
+  libs/AceLocale-3.0: https://repos.wowace.com/wow/ace3/trunk/AceLocale-3.0
-  Libs/AceDBOptions-3.0: https://repos.wowace.com/wow/ace3/trunk/AceDBOptions-3.0
-  Libs/AceEvent-3.0: https://repos.wowace.com/wow/ace3/trunk/AceEvent-3.0
-  Libs/AceGUI-3.0: https://repos.wowace.com/wow/ace3/trunk/AceGUI-3.0
-  Libs/AceHook-3.0: https://repos.wowace.com/wow/ace3/trunk/AceHook-3.0
-  Libs/AceLocale-3.0: https://repos.wowace.com/wow/ace3/trunk/AceLocale-3.0
 
 ignore:
   - twitch
-  - GricheldeTest.lua
 
 manual-changelog:
   filename: CHANGELOG.md

.release/README.md

@@ -1,311 +0,0 @@
-# release.sh
-
-__release.sh__ generates an addon zip file from a Git, SVN, or Mercurial
-checkout.
-
-__release.sh__ works by creating a new project directory (*.release* by
-default), copying files from the checkout into the project directory, checking
-out external repositories then copying their files into the project directory,
-then moves subdirectories into the project root.  The project directory is then
-zipped to create a distributable addon zip file which can also be uploaded to
-CurseForge, WoWInterface, Wago, and GitHub (as a release).
-
-__release.sh__ assumes that tags (Git annotated tags and SVN tags) are named for
-the version numbers for the project.  It will identify if the HEAD is tagged and
-use that as the current version number.  It will search back through parent
-commits for the previous tag and generate a changelog containing the commits
-since that tag.
-
-## Building with GitHub Actions
-
-For a full example workflow, please check out the [wiki page](https://github.com/BigWigsMods/packager/wiki/GitHub-Actions-workflow).
-
-### Example using [options](#Usage)
-
-```yaml
-- uses: BigWigsMods/packager@v1
-  with:
-    args: -g classic -m .pkgmeta-classic
-```
-
-## Customizing the build
-
-__release.sh__ uses the TOC file to determine the package name for the project.
-You can also set the CurseForge project id (`-p`), the WoWInterface addon
-id (`-w`) or the Wago project id (`-a`) by adding the following to the TOC file:
-
-```toc
-## X-Curse-Project-ID: 1234
-## X-WoWI-ID: 5678
-## X-Wago-ID: he54k6bL
-```
-
-Your CurseForge project id can be found on the addon page in the "About Project"
-side box.
-
-Your WoWInterface addon id is in the url for the addon, eg, the "5678"
-in <https://wowinterface.com/downloads/info5678-MyAddon>.
-
-Your Wago project id can be found on the developer dashboard.
-
-### The PackageMeta file
-
-__release.sh__ can read a __.pkgmeta__ file and supports the following
-directives. See the [wiki page](https://github.com/BigWigsMods/packager/wiki/Preparing-the-PackageMeta-File)
-for more info.
-
-- *externals* (Git, SVN, and Mercurial) Caveats: An external's .pkgmeta is only
-  parsed for ignore and externals will not have localization keywords replaced.
-- *ignore*
-- *changelog-title*
-- *manual-changelog*
-- *move-folders*
-- *package-as*
-- *enable-nolib-creation* (defaults to no) Caveats: nolib packages will only be
-  uploaded to GitHub and attached to a release. Unlike with the CurseForge
-  packager, manually uploaded nolib packages will not be used by the client when
-  users have enabled downloading libraries separately.
-- *tools-used*
-- *required-dependencies*
-- *optional-dependencies*
-- *embedded-libraries* Note: All fetched externals will be marked as embedded,
-  overriding any manually set relations in the pkgmeta.
-
-You can also use a few directives for WoWInterface uploading.
-
-- *wowi-archive-previous* : `yes|no` (defaults to yes) Archive the previous
-  release.
-- *wowi-create-changelog* : `yes|no` (defaults to yes) Generate a changelog
-  using BBCode that will be set when uploading. A manual changelog will always
-  be used instead if set in the .pkgmeta.
-- *wowi-convert-changelog* : `yes|no` (defaults to yes) Convert a manual
-  changelog in Markdown format to BBCode if you have [pandoc](http://pandoc.org/)
-  installed; otherwise, the manual changelog will be used as-is.  If set to `no`
-  when using a generated changelog, Markdown will be used instead of BBCode.
-  **Note**: Markdown support is experimental and needs to be requested on a
-  per-project basis.
-
-### String replacements
-
-__release.sh__ supports the following repository substitution keywords when
-copying the files from the checkout into the project directory. See the
-[wiki page](https://github.com/BigWigsMods/packager/wiki/Repository-Keyword-Substitutions)
-for more info.
-
-- *@[localization](https://github.com/BigWigsMods/packager/wiki/Localization-Substitution)(locale="locale", format="format", ...)@*
-  - *escape-non-ascii*
-  - *handle-unlocalized*
-  - *handle-subnamespaces="concat"*
-  - *key*
-  - *namespace*
-  - *same-key-is-true*
-  - *table-name*
-- *@file-revision@*
-- *@project-revision@*
-- *@file-hash@*
-- *@project-hash@*
-- *@file-abbreviated-hash@*
-- *@project-abbreviated-hash@*
-- *@file-author@*
-- *@project-author@*
-- *@file-date-iso@*
-- *@project-date-iso@*
-- *@file-date-integer@*
-- *@project-date-integer@*
-- *@file-timestamp@*
-- *@project-timestamp@*
-- *@project-version@*
-
-### Build type keywords
-
-Specific keywords used in a comment at the start (`@keyword@`) and end
-(`@end-keyword@`) of a block of code can be used to conditionally run that code
-based on the build type.  If the build type does not match, the block of code
-is comment out so line numbers do not change.
-
-Supported keywords and when the code block will run:
-
-- `alpha`: in untagged builds.
-- `debug`: never.  Code will only run when using an unpackaged source.
-- `do-not-package`: never.  Same as `debug` except removed from the packaged
-  file.
-- `no-lib-strip`: _(not supported in Lua files)_ in any build other than a
-  *nolib* build.
-- `retail`,`version-retail`,`version-classic`,`version-bcc`: based on game
-  version.
-
-`do-not-package` is a bit special. Everything between the tags, including the
-tags themselves, will always be removed from the packaged file. This will cause
-the line numbers of subsequent lines to change, which can result in bug report
-line numbers not matching the source code.  The typical usage is at the end of
-Lua files surrounding debugging functions and other code that end users should
-never see or execute.
-
-All keywords except `do-not-package` can be prefixed with `non-` to inverse the
-logic.  When doing this, the keywords should start and end a **block comment**
-as shown below.
-
-More examples are available on the [wiki page](https://github.com/BigWigsMods/packager/wiki/Repository-Keyword-Substitutions#debug-replacements).
-
-#### In Lua files
-
-`--@keyword@` and `--@end-keyword@`  
-turn into `--[===[@keyword` and `--@end-keyword]===]`.
-
-`--[===[@non-keyword@` and `--@end-non-keyword@]===]`  
-turn into `--@non-keyword@` and `--@end-non-keyword@`.
-
-#### In XML files
-
-**Note:** XML doesn't allow nested comments so make sure not to nest keywords.
-If you need to nest keywords, you can do so in the TOC instead.
-
-`<!--@keyword@-->` and `<!--@end-keyword@-->`  
-turn into `<!--@keyword` and `@end-keyword@-->`.
-
-`<!--@non-keyword@` and `@end-non-keyword@-->`  
-turn into `<!--@non-keyword@-->` and `<!--@end-non-keyword@-->`.
-
-#### In TOC files
-
-The lines with `#@keyword@` and `#@end-keyword@` get removed, as well as every
-line in-between.
-
-The lines with `#@non-keyword@` and `#@end-non-keyword@` get removed, as well as
-removing a '# ' at the beginning of each line in-between.
-
-### Changing the file name
-
-__release.sh__ uses the file name template `"{package-name}-{project-version}{nolib}{classic}"`
-for the addon zip file.  This can be changed with the `-n` switch (`release.sh
--n "{package-name}-{project-version}"`).
-
-These tokens are always replaced with their value:
-
-- `{package-name}`
-- `{project-revision}`
-- `{project-hash}`
-- `{project-abbreviated-hash}`
-- `{project-author}`
-- `{project-date-iso}`
-- `{project-date-integer}`
-- `{project-timestamp}`
-- `{project-version}`
-- `{game-type}`
-- `{release-type}`
-
-These tokens are "flags" and are conditionally shown prefixed with a dash based
-on the build type:
-
-- `{alpha}`
-- `{beta}`
-- `{nolib}`
-- `{classic}`
-
-`{classic}` has some additional magic:
-
-1. It will show as the non-retail build type, so either `-classic` or `-bcc`.
-2. It will not be shown if "-classic" or "-bcc" is in the project version.
-3. If it is included in the file name (it is by default) and #2 does not apply,
-   it will also be appended to the file label (i.e., the name shown on
-   CurseForge).
-
-## Building for multiple game versions
-
-__release.sh__ needs to know what version of World of Warcraft the package is
-targeting.  This is normally automatically detected using the `## Interface:`
-line of the addon's TOC file.
-
-If your addon supports both retail and classic in the same branch, you can use
-multiple `## Interface-Type:` lines in your TOC file.  Only one `## Interface:`
-line will be included in the packaged TOC file based on the targeted game
-version.
-
-```toc
-## Interface: 90005
-## Interface-Retail: 90005
-## Interface-Classic: 11306
-## Interface-BCC: 20501
-```
-
-You specify what version of the game you're targeting with the `-g` switch. You
-can use a specific version (`release.sh -g 1.13.6`) or you can use the game type
-(`release.sh -g classic`).  Using a game type will set the game version based on
-the appropriate TOC `## Interface` value.
-
-You can also set multiple specific versions as a comma delimited list using the
-`-g` switch (`release.sh -g 1.13.6,2.5.1,9.0.5`).  This will still only build
-one package, with the the last version listed used as the target version for
-the build.
-
-**Setting multiple versions is not recommended!** The addon will always be
-marked "Out of date" in-game for versions that do not match the TOC interface
-value for the last version set. So even if you don't need any special file
-processing, it will always be best to run the packager multiple times so the TOC
-interface value is correct for each game version.
-
-## Building locally
-
-The recommended way to include __release.sh__ in a project is to:
-
-1. Create a *.release* subdirectory in your top-level checkout.
-2. Copy __release.sh__ into the *.release* directory.
-3. Ignore the *.release* subdirectory in __.gitignore__.
-4. Run __release.sh__.
-
-## Usage
-
-```text
-Usage: release.sh [options]
-  -c               Skip copying files into the package directory.
-  -d               Skip uploading.
-  -e               Skip checkout of external repositories.
-  -l               Skip @localization@ keyword replacement.
-  -L               Only do @localization@ keyword replacement (skip upload to CurseForge).
-  -o               Keep existing package directory, overwriting its contents.
-  -s               Create a stripped-down "nolib" package.
-  -u               Use Unix line-endings.
-  -z               Skip zip file creation.
-  -t topdir        Set top-level directory of checkout.
-  -r releasedir    Set directory containing the package directory. Defaults to "$topdir/.release".
-  -p curse-id      Set the project id used on CurseForge for localization and uploading. (Use 0 to unset the TOC value)
-  -w wowi-id       Set the addon id used on WoWInterface for uploading. (Use 0 to unset the TOC value)
-  -a wago-id       Set the project id used on Wago Addons for uploading. (Use 0 to unset the TOC value)
-  -g game-version  Set the game version to use for uploading.
-  -m pkgmeta.yaml  Set the pkgmeta file to use.
-  -n package-name  Set the package zip file name. Use "-n help" for more info.
-```
-
-### Uploading
-
-__release.sh__ uses following environment variables for uploading:
-
-- `CF_API_KEY` - a [CurseForge API token](https://wow.curseforge.com/account/api-tokens),
-  required for the CurseForge API to fetch localization and upload files.
-- `WOWI_API_TOKEN` - a [WoWInterface API token](https://www.wowinterface.com/downloads/filecpl.php?action=apitokens),
-  required for uploading to WoWInterface.
-- `WAGO_API_TOKEN` - a [Wago Addons API token](https://addons.wago.io/account/apikeys),
-  required for uploading to Wago Addons.
-- `GITHUB_OAUTH` - a [GitHub personal access token](https://github.com/settings/tokens),
-  required for uploading to GitHub.
-
-__release.sh__ will attempt to load environment variables from a `.env` file in
-the topdir or current working directory.  You can also edit __release.sh__ and
-enter the tokens near the top of the file.
-
-### Dependencies
-
-__release.sh__ is mostly POSIX-compatible, so it should run in any Unix-like
-environment provided the following are available:
-
-- bash >= 4.3
-- awk
-- sed
-- curl
-- zip
-- version control software as needed:
-  - git >= 2.13.0
-  - subversion >= 1.7.0
-  - mercurial >= 3.9.0 (pre-3.9 will have issues with [secure connections](https://www.mercurial-scm.org/wiki/SecureConnections))
-- [jq](https://stedolan.github.io/jq/download/) >= 1.5 (when uploading)
-- [pandoc](https://pandoc.org/installing.html) >= 1.19.2 (optional)

CHANGELOG.md

@@ -3,51 +3,6 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), 
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## Version 1.1.7 - 2026-11-01
-### Added
-- messages during encounters are sent unchanged, with a one-time notice
-### Changed
-- handling of german umlauts (and other unicode characters)
-- updated libraries and bumped version for all incarnations of WoW (Classic Era, Forever, Classic, Retail)
-- adaptations to Retail v12 new Chat handling (API changes, encounter lockdown, instance chat)
-### Fixed
-- "/r" no longer sends to an empty whisper target if the last told target is unavailable
-- fixed replacements in instance chats
-- messages to unknown numbered channels are now discarded
-- right-click on the minimap button
- 
-## Version 1.1.6 - 2023-01-18
-### Changed
-- bumped version for latest WotLK Classic patch
-### Fixed 
-- updated Ace3.0 libraries for latest WotLK Classic patch
-
-## Version 1.1.5 - 2022-12-04
-### Fixed
-- updated Ace3 libraries for Dragonflight
-- bumped version for all incarnations of WoW (Classic Era, WotLK, Retail)
-
-## Version 1.1.4 - 2022-09-28
-### Changed
-- typos in descriptions
-- ambiguous variable definitions
-- bumped version for all incarnations of WoW (Classic Era, WotLK, Retail)
-
-## Version 1.1.3 - 2021-10-06
-### Changed
-- bumped version for all incarnations of WoW (Classic Era, Season of Mastery, BCC, Retail)
-### Fixed
-- error on missing options at first start
-- updated Ace3.0 libraries for latest Shadowlands patch
-
-## Version 1.1.2 - 2021-05-23
-### Changed
-- adopted to BigWigs release script to better support different game packages
-
-## Version 1.1.1 - 2021-04-22
-### Changed
-- bumped versions for WoW Classic and Shadowlands
-
 ## Version 1.1.0 - 2020-12-08
 ### Added
 - split of messages preserves item links, textures, substitutions and raid target markers
@@ -161,7 +116,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Version 0.3.0 - 2020-05-27
 ### Fixed
-- fixed DB storage and debug printing
+- fixed DB storange and debug printing
 
 ## Version 0.2.2 (unreleased) - 2020-05-26
 ### Added

Grichelde.lua

@@ -2,7 +2,7 @@
 
   Grichelde - Text Replacer
 
-  Copyright 2020 - 2026 Teilzeit-Jedi <tj@teilzeit-jedi.de>
+  Copyright 2020 Teilzeit-Jedi <tj@teilzeit-jedi.de>
 
   This addon is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,11 +20,9 @@ local _G = _G
 
 -- initialize addon
 local Grichelde = LibStub("AceAddon-3.0"):NewAddon(AddonTable, AddonName, "AceConsole-3.0", "AceEvent-3.0", "AceHook-3.0")
-local GetAddOnMetadata = (_G.C_AddOns and _G.C_AddOns.GetAddOnMetadata) or _G.GetAddOnMetadata
 Grichelde.version = GetAddOnMetadata(AddonName, "Version")
-Grichelde.build = GetAddOnMetadata(AddonName, "X-Build") or "Development"
+Grichelde.build = GetAddOnMetadata(AddonName, "X-Build") or "Experimental"
---Grichelde.era = _G.WOW_PROJECT_ID == _G.WOW_PROJECT_CLASSIC
+Grichelde.classic = _G.WOW_PROJECT_ID == _G.WOW_PROJECT_CLASSIC
---Grichelde.bcc = _G.WOW_PROJECT_ID == _G.WOW_PROJECT_BURNING_CRUSADE_CLASSIC
 Grichelde.logLevel = 0      -- cannot reference Grichelde.LOG_LEVELs here as they are loaded afterwards
 
 -- publish to global env
@@ -41,7 +39,7 @@ end
 
 function Grichelde:OnEnable()
     -- Hook in before message is sent to replace all character occurrences where replacements have been defined in the options
-    self:HookSendChatMessage()
+    self:RawHook("SendChatMessage", true)
 
     self.options, self.dialog = self:SetupOptions()
     self.ldb, self.icon = self:MinimapButton()
@@ -57,8 +55,7 @@ function Grichelde:OnEnable()
 end
 
 function Grichelde:OnDisable()
-    self:UnhookAll()
+    self:Unhook("SendChatMessage")
-    self.originalSend = nil
     self:CloseOptions()
     self:HideMinimapButton()
     self:UnregisterChatCommand("grichelde")

Grichelde.toc

@@ -1,36 +1,23 @@
-## Interface: 120105, 16001, 11509, 20506, 38002, 50504 
+## Interface: 11306
 
 ## Title: Grichelde
 ## Notes: Replaces characters of your chat input line before sending.
 ## Notes-de: Ersetzt eingegebene Zeichen in der Chat-Zeile vor dem Versenden.
-## Version: 1.1.7
+## Version: 1.1.0
 ## Author: Teilzeit-Jedi
 ## eMail: tj@teilzeit-jedi.de
-## AllowLoadGameType: standard, classic, camelot, forever
 
+## X-Build: Classic
 ## X-Curse-Project-ID: 385480
 ## X-License: GPLv3
 ## X-Category: Chat/Communication
-## X-Website: https://www.curseforge.com/wow/addons/grichelde
+## X-Credits: Teilzeit-Jedi
-## X-Maintainer: Teilzeit-Jedi
 ## X-Embeds: LibStub, CallbackHandler, Ace3, LibDataBroker, LibDBIcon
 
 ## OptionalDeps: LibStub, CallbackHandler, Ace3, LibDataBroker, LibDBIcon
 ## SavedVariables: GricheldeDB
 
-Libs\LibStub\LibStub.lua
+libs.xml
-Libs\CallbackHandler-1.0\CallbackHandler-1.0.xml
-Libs\AceAddon-3.0\AceAddon-3.0.xml
-Libs\AceLocale-3.0\AceLocale-3.0.xml
-Libs\AceEvent-3.0\AceEvent-3.0.xml
-Libs\AceHook-3.0\AceHook-3.0.xml
-Libs\AceConsole-3.0\AceConsole-3.0.xml
-Libs\AceDB-3.0\AceDB-3.0.xml
-Libs\AceDBOptions-3.0\AceDBOptions-3.0.xml
-Libs\AceGUI-3.0\AceGUI-3.0.xml
-Libs\AceConfig-3.0\AceConfig-3.0.xml
-Libs\LibDataBroker-1.1\LibDataBroker-1.1.lua
-Libs\LibDBIcon-1.0\LibDBIcon-1.0.lua
 
 Grichelde.lua
 GricheldeConstants.lua
@@ -43,6 +30,5 @@ GricheldeUpgrade.lua
 GricheldeOptions.lua
 GricheldeMinimap.lua
 GricheldeChat.lua
-#@do-not-package@
+
 GricheldeTest.lua
-#@end-do-not-package@

GricheldeChat.lua

@@ -1,10 +1,10 @@
 -- import addon read namespace from global env
-local _G = _G or getfenv()
+local _G = _G
 local Grichelde = _G.Grichelde or {}
 
-local assert, nilOrEmpty, pairs, ipairs, spairs, tContains, tFilter, tInsert, tIsEmpty, tSize, find, sub, gsub, getNextCharUtf8, isUtf8MultiByte, getUtf8Sequence, isUpper, isLower, toUpper, toLower, bytes2Char, trim, length, lengthUtf8
+local IsAddOnLoaded, assert, nilOrEmpty, pairs, ipairs, spairs, tContains, tFilter, tInsert, tConcat, tSize, tIsEmpty, find, sub, gsub, gmatch, getNextCharUtf8, isLetter, isUpper, isLower, toUpper, toLower, capitalize, bytes2Char, trim, length, lengthUtf8
-    = Grichelde.F.assert, Grichelde.F.nilOrEmpty, Grichelde.F.pairs, Grichelde.F.ipairs, Grichelde.F.spairs, Grichelde.F.tContains, Grichelde.F.tFilter, Grichelde.F.tInsert, Grichelde.F.tIsEmpty, Grichelde.F.tSize,
+    = Grichelde.F.IsAddOnLoaded, Grichelde.F.assert, Grichelde.F.nilOrEmpty, Grichelde.F.pairs, Grichelde.F.ipairs, Grichelde.F.spairs, Grichelde.F.tContains, Grichelde.F.tFilter, Grichelde.F.tInsert, Grichelde.F.tConcat, Grichelde.F.tSize, Grichelde.F.tIsEmpty,
-      Grichelde.F.find, Grichelde.F.sub, Grichelde.F.gsub, Grichelde.F.getNextCharUtf8, Grichelde.F.isUtf8MultiByte, Grichelde.F.getUtf8Sequence, Grichelde.F.isUpper, Grichelde.F.isLower, Grichelde.F.toUpper, Grichelde.F.toLower, Grichelde.F.bytes2Char, Grichelde.F.trim, Grichelde.F.length, Grichelde.F.lengthUtf8
+      Grichelde.F.find, Grichelde.F.sub, Grichelde.F.gsub, Grichelde.F.gmatch, Grichelde.F.getNextCharUtf8, Grichelde.F.isLetter, Grichelde.F.isUpper, Grichelde.F.isLower, Grichelde.F.toUpper, Grichelde.F.toLower, Grichelde.F.capitalize, Grichelde.F.bytes2Char, Grichelde.F.trim, Grichelde.F.length, Grichelde.F.lengthUtf8
 
 --- Splits a long text in longest possible chunks of <= 255 length, split at last available space
 -- @param text string
@@ -58,6 +58,7 @@ function Grichelde:SplitText(text)
         -- must not enforce UTF-8 support here, as the positions are used
         while ((length(newText) > 0) and (escape < Grichelde.ENDLESS_LOOP_LIMIT)) do
             escape = escape + 1
+            local previousChar = currentChar
             local first, textAhead = getNextCharUtf8(newText)
             currentChar = first
             self:DebugPrint("SplitText : currentChar, escape: %s, %s", currentChar, escape)
@@ -142,35 +143,17 @@ end
 function Grichelde:SendChunkifiedChatMessage(message, ...)
     if (length(message) > 255) then
         local chunks = self:SplitText(message)
-        self:DebugPrint("SendChunkifiedChatMessage : #chunks:", tSize(chunks))
+        self:DebugPrint("SendChunkifiedChatMessage : #chunks:", #chunks)
 
         for _, chunk in ipairs(chunks) do
-            self:SendOriginal(chunk, ...)
+            self.hooks["SendChatMessage"](chunk, ...);
         end
     else
-        self:SendOriginal(message, ...)
+        self.hooks["SendChatMessage"](message, ...);
     end
 end
 
 function Grichelde:ReplaceCharacters(text, replName, replTable, consolidate, replacedTexts)
-    local function convertToCaseInsensitivePatternGroup(p)
-        local upperP, lowerP = toUpper(p), toLower(p)
---[[
-        if (isUtf8MultiByte(p)) then
-            local sequence = nil
-            for _, byteSequence in spairs(getUtf8Table(upperP)) do
-                sequence = sequence .. byteSequence
-            end
-        else
-]]
-            if (upperP ~= lowerP) then
-                return upperP .. lowerP
-            else
-                return p
-            end
-        --end
-    end
-
     local function convertToCaseInsensitivePattern(pattern)
         local ciPattern = ""
         local ignored = {'^', '$', '(', ')', '.'}
@@ -201,22 +184,18 @@ function Grichelde:ReplaceCharacters(text, replName, replTable, consolidate, rep
                             ciPattern = ciPattern .. "%" .. p
                         end
                     else
-                        ciPattern = ciPattern .. convertToCaseInsensitivePatternGroup(p)
+                        local upperP, lowerP = toUpper(p), toLower(p)
+                        if (upperP ~= lowerP) then
+                            ciPattern = ciPattern .. upperP .. lowerP
+                        else
+                            ciPattern = ciPattern .. p
+                        end
                     end
                     p, patRest = getNextCharUtf8(patRest)
                 end
                 ciPattern = ciPattern .. "]"
-            elseif (isUtf8MultiByte(p)) then
-                -- a set like [Ää] would match single bytes, so only group the differing last byte
-                local upperP, lowerP = toUpper(p), toLower(p)
-                local lead = sub(p, 1, -2)
-                if (upperP ~= lowerP) and (sub(upperP, 1, -2) == lead) and (sub(lowerP, 1, -2) == lead) then
-                    ciPattern = ciPattern .. lead .. "[" .. sub(upperP, -1) .. sub(lowerP, -1) .. "]"
             else
-                    ciPattern = ciPattern .. p
+                ciPattern = ciPattern .. "[" ..  Grichelde.F.toUpper(p) .. Grichelde.F.toLower(p) .. "]"
-                end
-            else
-                ciPattern = ciPattern .. "[" .. convertToCaseInsensitivePatternGroup(p) .. "]"
             end
 
             p, patRest = getNextCharUtf8(patRest)
@@ -225,12 +204,11 @@ function Grichelde:ReplaceCharacters(text, replName, replTable, consolidate, rep
         return ciPattern
     end
 
-    local function replaceCaptures(txt, replaceText, captures)
+    local function replaceCaptures(text, replaceText, captures)
         local replText = replaceText
-        local n = tSize(captures)
+        self:TracePrint("replaceCaptures : text: %s, #captures: %d", text, #captures)
-        self:TracePrint("replaceCaptures : txt: %s, #captures: %d", txt, n)
 
-        if (n > 0) then
+        if (#captures > 0) then
             for i, cap in ipairs(captures) do
                 --self:TracePrint("replaceCaptures : i: %d, cap: %s", i, cap)
                 if (cap == nil) then
@@ -307,6 +285,9 @@ function Grichelde:ReplaceCharacters(text, replName, replTable, consolidate, rep
     self:TracePrint("ReplaceCharacters : pos1: %d, pos2: %d", pos1, pos2)
     self:TracePrint("ReplaceCharacters : cap1: %s, cap2: %s, cap3: %s, cap4: %s, cap5: %s, cap6: %s, cap7: %s, cap8: %s, cap9: %s", cap1, cap2, cap3, cap4, cap5, cap6, cap7, cap8, cap9)
     while (pos1 ~= nil) and (pos2 ~= nil) and (pos1 <= pos2) do
+        -- continue from that position later
+        pos = pos2 + 1
+
         if doStopOnMatch then
             stopOnMatch = true
         end
@@ -316,24 +297,6 @@ function Grichelde:ReplaceCharacters(text, replName, replTable, consolidate, rep
         local post = sub(result, pos2 + 1)
         local wordStart = sub(pre, -1, -1)
         local wordEnd = sub(post, 1, 1)
-        self:TracePrint("ReplaceCharacters : result: %s", result)
-        self:TracePrint("ReplaceCharacters : pre: %s, match: %s, post: %s, wordStart: %s, wordEnd: %s", pre, match, post, wordStart, wordEnd)
-
---[[
-        self:TracePrint("ReplaceCharacters : pos2: %d, isChar: %s", pos2, isChar(match))
-        while (not isChar(match) and pos2 < length(result)) do
-            pos2 = pos2 + 1
-            pre = sub(result, 1, pos1 - 1)
-            match = sub(result, pos1, pos2)
-            post = sub(result, pos2 + 1)
-            wordStart = sub(pre, -1, -1)
-            wordEnd = sub(post, 1, 1)
-            self:TracePrint("ReplaceCharacters : pos2: %d, isChar: %s", pos2, isChar(match))
-        end
-]]
-
-        -- continue from that position later
-        pos = pos2 + 1
 
         -- additional checks for word boundaries
         local doesMatchWhen = false
@@ -437,9 +400,8 @@ function Grichelde:ReplaceCharacters(text, replName, replTable, consolidate, rep
             end
 
             -- update previous consolidate markers
-            -- positions are byte offsets, so the difference must be counted in bytes as well
+            local diff = lengthUtf8(replText) - lengthUtf8(match)
-            local diff = length(replText) - length(match)
+            self:TracePrint("ReplaceCharacters : diff = %d - %d", lengthUtf8(replText), lengthUtf8(match))
-            self:TracePrint("ReplaceCharacters : diff = %d - %d", length(replText), length(match))
             for key, posList in pairs(consolidate) do
                 if (key ~= replName) then
                     for i, pc in ipairs(posList) do
@@ -479,8 +441,8 @@ end
 -- @param text string
 -- @param replacements table of mappings
 -- @return string
-function Grichelde:ReplaceAndConsolidate(text, _replacements)
+function Grichelde:ReplaceAndConsolidate(text, replacements)
-    local replacements = _replacements or self.db.profile.replacements or {}
+    local replacements = replacements or self.db.profile.replacements or {}
     self:TracePrint("ReplaceAndConsolidate : replacements")
     self:TracePrint(replacements)
 
@@ -569,6 +531,7 @@ function Grichelde:CheckForLink(text, currentChar)
         for _, pattern in ipairs(Grichelde.IGNORE_PATTERNS.LINKS) do
             local pos1, pos2 = find(text, "^" .. pattern)
             if (pos1 == 1) and (pos2 ~= nil) then
+                local match = sub(text, pos1, pos2)
                 self:DebugPrint("CheckForLink : Found link or texture pattern \"%s\" at (%d, %d)", pattern, pos1, pos2)
                 return pos2
             end
@@ -627,10 +590,10 @@ function Grichelde:CheckForRaidTargetMarkers(text, currentChar)
             local translation = toLower(self.L["IgnorePattern_" .. localizedRT])
             local localizedPattern = "^{" .. translation .. "}"
             self:TracePrint("CheckForPreversableText : localizedPattern:", localizedPattern)
-            local p1, p2 = find(lowerText, localizedPattern)
+            local pos1, pos2 = find(lowerText, localizedPattern)
-            if (p1 == 1) and (p2 ~= nil) then
+            if (pos1 == 1) and (pos2 ~= nil) then
-                self:DebugPrint("CheckForPreversableText : Found localized raid target marker \"%s\" at (%d, %d)", localizedPattern, p1, p2)
+                self:DebugPrint("CheckForPreversableText : Found localized raid target marker \"%s\" at (%d, %d)", localizedPattern, pos1, pos2)
-                return p2
+                return pos2
             end
         end
     end
@@ -673,9 +636,9 @@ end
 -- @param previousChar string(1) previous character of the text, otherwise unreachable
 -- @param preserveEmotes boolean ignore replacements for emotes, for testing purposes
 -- @return number
-function Grichelde:CheckForPreversableText(text, currentChar, previousChar, _replaceEmotes)
+function Grichelde:CheckForPreversableText(text, currentChar, previousChar, replaceEmotes)
     self:DebugPrint("CheckForPreversableText : text:", text)
-    local replaceEmotes = _replaceEmotes or self.db.profile.channels.emote or false
+    local replaceEmotes = replaceEmotes or self.db.profile.channels.emote or false
 
     local linkPos = self:CheckForLink(text, currentChar)
     if (linkPos ~= nil) then
@@ -716,11 +679,11 @@ end
 -- @param text string the text to apply the mappings on
 -- @param preserveEmotes boolean ignore replacements for emotes, for testing purposes
 -- @return string
-function Grichelde:ReplaceText(text, _replacements, _replaceEmotes)
+function Grichelde:ReplaceText(text, replacements, replaceEmotes)
     local lookAheads = { '|', '*', '<', '%', '{', '(', 'o' }
     local newText = text
-    local preserveEmotes = _replaceEmotes or self.db.profile.channels.emote or false
+    local preserveEmotes = replaceEmotes or self.db.profile.channels.emote or false
-    local replacements = _replacements or self.db.profile.replacements or {}
+    local replacements = replacements or self.db.profile.replacements or {}
     local finalText, replaceText = "", ""
     local currentChar
     local escape = 0
@@ -886,7 +849,7 @@ function Grichelde:CheckAndExtractMessageTypeTarget(message)
         local type = tFilter(self.SUPPORTED_CHAT_COMMANDS,
             function(_, k, _) return chatCmd == k end
         )
-        assert(tSize(type) < 2)
+        assert(#type < 2)
 
         if (not tIsEmpty(type)) then
             self:DebugPrint("CheckAndExtractMessageTypeTarget : determined type: %s", type[1])
@@ -896,18 +859,8 @@ function Grichelde:CheckAndExtractMessageTypeTarget(message)
                 -- special reply handling
                 if ("/r" == chatCmd) or ("/reply" == chatCmd) then
                     -- reuse last type and target if possible
-                    local getLastToldTarget = (_G.ChatFrameUtil and _G.ChatFrameUtil.GetLastToldTarget) or _G.ChatEdit_GetLastToldTarget
+                    local lastTold, lastToldType = ChatEdit_GetLastToldTarget()
-                    local lastTold, lastToldType
-                    if (getLastToldTarget ~= nil) then
-                        lastTold, lastToldType = getLastToldTarget()
-                    end
                     self:DebugPrint("CheckAndExtractMessageTypeTarget : lastTell, lastTellType =", lastTold, lastToldType)
-
-                    if (nilOrEmpty(lastTold)) then
-                        self:ErrorPrint(self.L.Error_InvalidWhisperTarget)
-                        -- dont send text at all
-                        return nil
-                    end
                     return targetAndText, lastToldType or "WHISPER", lastTold
                 elseif ("/tt" == chatCmd) then
                     -- determine target from game world selection
@@ -951,7 +904,7 @@ function Grichelde:CheckAndExtractMessageTypeTarget(message)
             local _, _, channelNumber = find(chatCmd, "^/(%d+)")
             if (channelNumber ~= nil) then
                 local channelId = GetChannelName(channelNumber)
-                if (channelId ~= nil) and (channelId > 0) then
+                if (channelId ~= nil) then
                     return targetAndText, "CHANNEL", channelId
                 end
             end
@@ -970,50 +923,8 @@ function Grichelde:CheckAndExtractMessageTypeTarget(message)
     end
 end
 
---- Hooks C_ChatInfo.SendChatMessage (Retail) and the global SendChatMessage (Classic, deprecated alias on Retail).
---- The original C_ChatInfo function is preferred for sending.
-function Grichelde:HookSendChatMessage()
-    local chatInfo = _G.C_ChatInfo
-    if (chatInfo ~= nil) and (chatInfo.SendChatMessage ~= nil) then
-        self:RawHook(chatInfo, "SendChatMessage", "SendChatMessage", true)
-        self.originalSend = self.hooks[chatInfo]["SendChatMessage"]
-    end
-
-    if (_G.SendChatMessage ~= nil) then
-        self:RawHook("SendChatMessage", true)
-        self.originalSend = self.originalSend or self.hooks["SendChatMessage"]
-    end
-end
-
---- Sends a message with the original (unhooked) send function.
-function Grichelde:SendOriginal(...)
-    return self.originalSend(...)
-end
-
---- Midnight blocks chat modifications by addons during instance encounters.
---- Prints a notice once per lockdown.
--- @return boolean
-function Grichelde:IsChatLockedDown()
-    local chatInfo = _G.C_ChatInfo
-    if (chatInfo == nil) or (chatInfo.InChatMessagingLockdown == nil) then
-        return false
-    end
-
-    if (chatInfo.InChatMessagingLockdown()) then
-        if (not self.lockdownNoticeShown) then
-            self.lockdownNoticeShown = true
-            self:PrefixedPrint(self.L.Chat_Lockdown_Notice)
-        end
-        return true
-    end
-
-    self.lockdownNoticeShown = false
-    return false
-end
-
 function Grichelde:CleanseMessage(message)
     local text = message or ""
-    local IsAddOnLoaded = (_G.C_AddOns and _G.C_AddOns.IsAddOnLoaded) or _G.IsAddOnLoaded
     if (IsAddOnLoaded("Misspelled")) then
         self:DebugPrint("Misspelled detected: cleansing message")
         text = _G.Misspelled:RemoveHighlighting(message)
@@ -1033,12 +944,7 @@ function Grichelde:SendChatMessageOverride(message, ...)
     local msg, type, chan = self:CheckAndExtractMessageTypeTarget(cleasendText)
 
     if (msg ~= nil) then
-        if (not self:IsChatLockedDown()) then
         msg = self:ReplaceText(msg)
-        else
-            -- do not modify message in any way during encounters
-            -- msg = msg .. self.L.Chat_Lockdown_Suffix
-        end
 
         if (type ~= nil) then
             self:SendChunkifiedChatMessage(msg, type, fallbackLang, chan, ...)
@@ -1056,39 +962,19 @@ end
 -- @param language string
 -- @param channel string
 function Grichelde:SendChatMessage(message, type, ...)
-    if (self.isReplacing) then
-        -- re-entered through the other hooked send function, text is already replaced
-        self:DebugPrint("SendChatMessage : already replacing")
-        self:SendOriginal(message, type, ...)
-        return
-    end
-
-    self.isReplacing = true
-    -- always reset the guard, even if replacing fails
-    local ok, err = pcall(self.ReplaceAndSendChatMessage, self, message, type, ...)
-    self.isReplacing = false
-    if (not ok) then
-        error(err, 0)
-    end
-end
-
-function Grichelde:ReplaceAndSendChatMessage(message, type, ...)
     if (not self.db.profile.enabled) then
         self:DebugPrint("SendChatMessage : disabled")
-        self:SendOriginal(message, type, ...)
+        self.hooks["SendChatMessage"](message, type, ...);
     elseif (nilOrEmpty(message)) then
         self:DebugPrint("SendChatMessage : no text")
-        self:SendOriginal(message, type, ...)
+        self.hooks["SendChatMessage"](message, type, ...);
-    elseif (self:IsChatLockedDown()) then
-        self:DebugPrint("SendChatMessage : chat lockdown")
-        self:SendOriginal(message, type, ...)
     else
         local cleasendText = self:CleanseMessage(message)
         if (self:CheckReplacementAllowed(cleasendText, type)) then
             cleasendText = self:ReplaceText(cleasendText)
             self:SendChunkifiedChatMessage(cleasendText, type, ...)
         else
-            self:SendOriginal(message, type, ...)
+            self.hooks["SendChatMessage"](message, type, ...);
         end
     end
 end

GricheldeConstants.lua

@@ -1,13 +1,11 @@
 -- read namespace from global env
-local _G = _G or getfenv()
+local _G = _G
 local Grichelde = _G.Grichelde or {}
 
 -- constants and upvalues
 Grichelde.LOG_LEVEL = { DEBUG = 1, TRACE = 2 }
 
--- chat input in client is limited to 255 bytes (unicode length is less)
 Grichelde.INPUT_LIMIT = 255
--- safety measure in case malformed user input causes infinite loops on string parsing
 Grichelde.ENDLESS_LOOP_LIMIT = 10000
 Grichelde.MAPPING_OFFSET = 10
 Grichelde.MINIMAP_ENABLED = 1.0
@@ -114,7 +112,7 @@ Grichelde.BLIZZ_TYPE_TO_OPTIONS = {
     ["OFFICER"]      = "officer",
     ["RAID"]         = "raid",
     ["RAID_WARNING"] = "raidWarning",
-    ["INSTANCE_CHAT"] = "instance",
+    ["INSTANCE"]     = "instance",
     ["BATTLEGROUND"] = "battleground",
     ["WHISPER"]      = "whisper",
 }
@@ -168,14 +166,14 @@ Grichelde.IGNORE_PATTERNS = {
 }
 
 local function nilOrEmpty(s)
-    return s == nil or Grichelde.F.trim(s) == ""
+    return s == nil or s:trim() == ""
 end
 
-local function spairs(tbl, orderFunc)
+local function spairs(t, orderFunc)
     -- collect the keys
     local sortedKeys = {}
     -- for every non-nil value
-    for key, _ in Grichelde.F.pairs(tbl) do
+    for key, _ in Grichelde.F.pairs(t) do
         Grichelde.F.tInsert(sortedKeys, key)
     end
 
@@ -191,22 +189,22 @@ local function spairs(tbl, orderFunc)
     return function()
         it = it + 1
         if (sortedKeys[it] ~= nil) then
-            return sortedKeys[it], tbl[sortedKeys[it]]
+            return sortedKeys[it], t[sortedKeys[it]]
         else
             return nil
         end
     end
 end
 
-local function tFilter(type, condition, extract)
+local function tFilter(t, condition, extract)
     local filtered = {}
-    for key, value in Grichelde.F.pairs(type) do
+    for key, value in Grichelde.F.pairs(t) do
         local cond = false
         if (condition) then
-            local typ = Grichelde.F.type(condition)
+            local t = Grichelde.F.type(condition)
-            if (typ == "function") then
+            if (t == "function") then
-                cond = condition(typ, key, value)
+                cond = condition(t, key, value)
-            elseif (typ == "string") or (typ == "number") then
+            elseif (t == "string") or (t == "number") then
                 cond = (value == condition)
             end
         end
@@ -214,7 +212,7 @@ local function tFilter(type, condition, extract)
         if (cond) then
             local val = value
             if (extract and (Grichelde.F.type(extract) == "function")) then
-                val = extract(type, key, value)
+                val = extract(t, key, value)
             end
             Grichelde.F.tInsert(filtered, val)
         end
@@ -222,20 +220,20 @@ local function tFilter(type, condition, extract)
     return filtered
 end
 
-local function tSize(tbl)
+local function tSize(t)
     local size = 0
-    if (tbl ~= nil) then
+    if (t ~= nil) then
         -- for every non-nil value
-        for _, _ in Grichelde.F.pairs(tbl) do
+        for _, _ in Grichelde.F.pairs(t) do
             size = size + 1
         end
     end
     return size
 end
 
-local function tIsEmpty(tbl)
+local function tIsEmpty(t)
-    if (not tbl) then return true end
+    if (not t) then return true end
-    return Grichelde.F.tNext(tbl) == nil
+    return Grichelde.F.tNext(t) == nil
 end
 
 local function tClone(orig)
@@ -287,115 +285,6 @@ local function getNextCharUtf8(word)
     end
 end
 
-local function isUtf8MultiByte(word)
-    return Grichelde.F.length(word) ~= Grichelde.F.lengthUtf8(word)
-end
-
-local function getUtf8Sequence(word)
-    if ((word == nil) or (Grichelde.F.type(word) ~= "string") or (Grichelde.F.lengthUtf8(word) ~= 1)) then
-        return nil
-    end
-
-    --[[
-     You could use the following code snippet to iterate over UTF-8 sequences
-     (this will simply skip over most invalid codes):
-
-        for uchar in string.gmatch(ustring, "([%z\1-\127\194-\244][\128-\191]*)") do
-          ...
-        end
-    ]]--
-
-    local sequence = "%z"
-    local c1 = Grichelde.F.toByte(word, 1)
-    sequence = sequence .. "\\" .. c1
-
-    if (c1 > 0) and (c1 <= 127) then
-        -- UTF8-1
-        return sequence
-    end
-
-    local c2 = Grichelde.F.toByte(word, 2)
-    sequence = sequence .. "\\" .. c2
-    if (c1 >= 194) and (c1 <= 223) then
-        -- UTF8-2
-        return sequence
-    end
-
-    local c3 = Grichelde.F.toByte(word, 3)
-    sequence = sequence .. "\\" .. c3
-    if (c1 >= 224) and (c1 <= 239) then
-        -- UTF8-3
-        return sequence
-    end
-
-    local c4 = Grichelde.F.toByte(word, 4)
-    sequence = sequence .. "\\" .. c4
-    if (c1 >= 240) and (c1 <= 244) then
-        -- UTF8-4
-        return sequence
-    end
-
-    return nil
-end
-
-local function getUtf8Table(word)
-    if ((word == nil) or (Grichelde.F.type(word) ~= "string") or (Grichelde.F.lengthUtf8(word) ~= 1)) then
-        return nil
-    end
-
-    --[[
-     You could use the following code snippet to iterate over UTF-8 sequences
-     (this will simply skip over most invalid codes):
-
-        for uchar in string.gmatch(ustring, "([%z\1-\127\194-\244][\128-\191]*)") do
-          ...
-        end
-    ]]--
-
-    local tbl = {}
-
-    local c1 = Grichelde.F.toByte(word, 1)
-    Grichelde.F.tInsert(tbl, "%z\\" .. c1)
-
-    local c2 = Grichelde.F.toByte(word, 2)
-    if (c1 >= 194) and (c1 <= 223) then
-        -- UTF8-2
-        Grichelde.F.tInsert(tbl, "\\" .. c2)
-    end
-
-    local c3 = Grichelde.F.toByte(word, 3)
-    if (c1 >= 224) and (c1 <= 239) then
-        -- UTF8-3
-        Grichelde.F.tInsert(tbl, "\\" .. c3)
-    end
-
-    local c4 = Grichelde.F.toByte(word, 4)
-    if (c1 >= 240) and (c1 <= 244) then
-        -- UTF8-4
-        Grichelde.F.tInsert(tbl, "\\" .. c4)
-    end
-
-    return tbl
-end
-
---- handles UTF-8 characters like äöü (except ß, ÿ, × and ÷)
-local function toUpper(word)
-    return (Grichelde.F.gsub(_G.strupper(word), "\195([\160-\190])", function(c)
-        if (c ~= "\183") then
-            return "\195" .. Grichelde.F.bytes2Char(Grichelde.F.toByte(c) - 32)
-        end
-    end))
-end
-
---- handles UTF-8 characters like äöü (except ß, ÿ, × and ÷)
-local function toLower(word)
-    return (Grichelde.F.gsub(_G.strlower(word), "\195([\128-\158])", function(c)
-        if (c ~= "\151") then
-            return "\195" .. Grichelde.F.bytes2Char(Grichelde.F.toByte(c) + 32)
-        end
-    end))
-end
-
 local function isLetter(word)
     local char = Grichelde.F.getNextCharUtf8(word)
     return (char ~= nil) and (Grichelde.F.toUpper(char) ~= Grichelde.F.toLower(char))
@@ -434,11 +323,11 @@ local function isCapital(word)
         return false
     else
         local first, rest = Grichelde.F.getNextCharUtf8(word)
-        local isCap = Grichelde.F.isUpper(first)
+        local isCapital = Grichelde.F.isUpper(first)
         if (rest ~= nil) then
-            return isCap and Grichelde.F.isLower(rest)
+            return isCapital and Grichelde.F.isLower(rest)
         else
-           return isCap
+           return isCapital
         end
     end
 end
@@ -457,17 +346,8 @@ local function capitalize(word)
     end
 end
 
-local function trim(s)
+local function color(color, text)
-    if ((s == nil) or (Grichelde.F.type(s) ~= "string")) then
+    return color .. text .. Grichelde.COLOR_CODES.CLOSE
-        return nil
-    end
-
-    local n = Grichelde.F.find(s, "%S")
-    return n and Grichelde.F.match(s, ".*%S", n) or ""
-end
-
-local function color(colour, text)
-    return colour .. text .. Grichelde.COLOR_CODES.CLOSE
 end
 
 local function cPrefix(text)
@@ -504,6 +384,7 @@ end
 
 -- faster function lookups by mapping to local refs
 Grichelde.F = {
+    IsAddOnLoaded   = _G.IsAddOnLoaded,
     assert          = _G.assert,
     type            = _G.type,
     print           = _G.print,
@@ -532,12 +413,9 @@ Grichelde.F = {
     gmatch          = _G.string.gmatch,
     join            = _G.strjoin,
     split           = _G.strsplit,
-    toUpper         = toUpper,
+    toUpper         = _G.strupper,
-    toLower         = toLower,
+    toLower         = _G.strlower,
     getNextCharUtf8 = getNextCharUtf8,
-    isUtf8MultiByte = isUtf8MultiByte,
-    getUtf8Sequence = getUtf8Sequence,
-    getUtf8Table    = getUtf8Table,
     isLetter        = isLetter,
     isNumber        = isNumber,
     isUpper         = isUpper,
@@ -557,8 +435,7 @@ Grichelde.F = {
     bytes2Char      = _G.string.char,
     format          = _G.string.format,
     rep             = _G.string.rep,
-    -- trim            = _G.strtrim,
+    trim            = _G.strtrim,
-    trim            = trim,
     length          = _G.string.len,
     lengthUtf8      = _G.strlenutf8,
     toString        = _G.tostring,

GricheldeDatabase.lua

@@ -1,9 +1,9 @@
 -- read namespace from global env
-local _G = _G or getfenv()
+local _G = _G
 local Grichelde = _G.Grichelde or {}
 
-local pairs, tInsert, tClone, tSize, unpack, join, toString
+local pairs, tInsert, tClone, tWipe, unpack, join, toString
-    = Grichelde.F.pairs, Grichelde.F.tInsert, Grichelde.F.tClone, Grichelde.F.tSize, Grichelde.F.unpack, Grichelde.F.join, Grichelde.F.toString
+    = Grichelde.F.pairs, Grichelde.F.tInsert, Grichelde.F.tClone, Grichelde.F.tWipe, Grichelde.F.unpack, Grichelde.F.join, Grichelde.F.toString
 
 function Grichelde.getDefaultConfig()
     return {
@@ -84,40 +84,38 @@ end
 
 function Grichelde:SyncToDatabase(info, val)
     self:TracePrint("SyncToDatabase : info")
-    local n = #info
+    for i = 0, #info do
-    for i = 0, n do
         self:TracePrint("%d = %s", i, info[i])
     end
 
     local option = self.db.profile
     local path = 1
-    while (path < n) do
+    while (path < #info) do
         if (info[path] ~= "mappings") then
             option = option[info[path]]
         end
         path = path + 1
     end
-    local optionPath = join(".", unpack(info, 1, n))
+    local optionPath = join(".", unpack(info, 1, #info))
     self:DebugPrint("change option \"%s\" from %s to %s", optionPath, toString(option[info[path]]), toString(val))
     option[info[path]] = val
 end
 
 function Grichelde:ReadFromDatabase(info)
     self:TracePrint("ReadFromDatabase : info")
-    local n = #info
+    for i = 0, #info do
-    for i = 0, n do
         self:TracePrint("%d = %s", i, info[i])
     end
 
     local option = self.db.profile
     local path = 1
-    while (path <= n) do
+    while (path <= #info) do
         if (info[path] ~= "mappings") then
             option = option[info[path]]
         end
         path = path + 1
     end
-    local optionPath = join(".", unpack(info, 1, n))
+    local optionPath = join(".", unpack(info, 1, #info))
     self:DebugPrint("read option \"%s\": %s", optionPath, toString(option))
     return option
 end

GricheldeMinimap.lua

@@ -1,8 +1,9 @@
 -- read namespace from global env
-local _G = _G or getfenv()
+local _G = _G
 local Grichelde = _G.Grichelde or {}
 
-local cGreen, cRed = Grichelde.F.cGreen, Grichelde.F.cRed
+local cPrefix, cGreen, cRed
+    = Grichelde.F.cPrefix, Grichelde.F.cGreen, Grichelde.F.cRed
 
 
 --- add Minimap button
@@ -48,7 +49,7 @@ function Grichelde:MinimapButton()
         icon = "Interface\\Icons\\Spell_Holy_Silence",
         --icon = ([[Interface\Addons\%s\%s]]):format(self.name, self.name),
         OnClick = clickHandler,
-        OnRightClick = function() self:ToogleMappings() end,
+        OnRightClick = function() self:ShowMappings() end,
         OnTooltipShow = updateTooltip,
         iconR = darkened,
         iconG = darkened,

GricheldeOptions.lua

@@ -1,9 +1,9 @@
 -- read namespace from global env
-local _G = _G or getfenv()
+local _G = _G
 local Grichelde = _G.Grichelde or {}
 
-local assert, nilOrEmpty, pairs, ipairs, spairs, tContains, tInsert, tClone, tSize, tWipe, find, match, cPrefix, cGray, cGreen, cOrange, cRed, format, toString, toNumber
+local assert, nilOrEmpty, pairs, ipairs, spairs, tContains, tInsert, tClone, tWipe, find, match, cPrefix, cGray, cGreen, cOrange, cRed, format, toString, toNumber
-    = Grichelde.F.assert, Grichelde.F.nilOrEmpty, Grichelde.F.pairs, Grichelde.F.ipairs, Grichelde.F.spairs, Grichelde.F.tContains, Grichelde.F.tInsert, Grichelde.F.tClone, Grichelde.F.tSize, Grichelde.F.tWipe, Grichelde.F.find, Grichelde.F.match, Grichelde.F.cPrefix, Grichelde.F.cGray, Grichelde.F.cGreen, Grichelde.F.cOrange, Grichelde.F.cRed, Grichelde.F.format, Grichelde.F.toString, Grichelde.F.toNumber
+    = Grichelde.F.assert, Grichelde.F.nilOrEmpty, Grichelde.F.pairs, Grichelde.F.ipairs, Grichelde.F.spairs, Grichelde.F.tContains, Grichelde.F.tInsert, Grichelde.F.tClone, Grichelde.F.tWipe, Grichelde.F.find, Grichelde.F.match, Grichelde.F.cPrefix, Grichelde.F.cGray, Grichelde.F.cGreen, Grichelde.F.cOrange, Grichelde.F.cRed, Grichelde.F.format, Grichelde.F.toString, Grichelde.F.toNumber
 
 local selectedExample = 1
 
@@ -254,7 +254,7 @@ function Grichelde:CreateOptionsUI()
                                 name = self.L.Options_Help_Examples_Import_Name,
                                 -- desc = self.L.Options_Help_Examples_Import_Desc,
                                 desc = function() return format(self.L.Options_Help_Examples_Import_Desc, cPrefix(self.L.Options_Help_Examples[selectedExample].name)) end,
-                                func = function(_) self:ImportExample(selectedExample) end,
+                                func = function(info) self:ImportExample(selectedExample) end,
                             },
 
                             spacer4 = {
@@ -416,6 +416,7 @@ function Grichelde:SetupOptions()
     LibStub("AceConfig-3.0"):RegisterOptionsTable(self.name, options)
     local dialog = LibStub("AceConfigDialog-3.0")
     dialog:AddToBlizOptions(self.name, self.L.AddonName)
+
     return options, dialog
 end
 
@@ -464,9 +465,8 @@ function Grichelde:RefreshProfiles(event, _, profileName)
 end
 
 function Grichelde:ToggleOptions()
-    local isOpen = (self.dialog ~= nil) and (self.dialog.OpenFrames[self.name] ~= nil)
+    self:DebugPrint("ToggleOptions : options open: ", not not self.dialog.OpenFrames[self.name])
-    self:DebugPrint("ToggleOptions : options open: ", isOpen)
+    if (self.dialog ~= nil) and (self.dialog.OpenFrames[self.name] ~= nil) then
-    if (isOpen) then
         self:CloseOptions()
     else
         self:OpenOptions()
@@ -559,7 +559,7 @@ end
 
 function Grichelde:ExtractExampleCodes(num)
     self:TracePrint("ExtractExampleCodes : number is: %d", num)
-    if (self.L.Options_Help_Examples[num] == nil) or (tSize(self.L.Options_Help_Examples) < num) then
+    if (self.L.Options_Help_Examples[num] == nil) or (#self.L.Options_Help_Examples < num) then
         self:DebugPrint("ExtractExampleCodes : invalid number: %d", num)
         return self.L.Options_Help_Examples_Text
     end
@@ -581,9 +581,8 @@ end
 
 function Grichelde:ImportExample(num)
     self:TracePrint("ImportExample : number is: %d", num)
-    if (self.L.Options_Help_Examples[num] == nil) or (tSize(self.L.Options_Help_Examples) < num) then
+    if (self.L.Options_Help_Examples[num] == nil) or (#self.L.Options_Help_Examples < num) then
         self:DebugPrint("ImportExample : invalid number: %d", num)
-        return
     end
 
     local profileName = self.L.Options_Help_Examples[num].name
@@ -618,7 +617,6 @@ function Grichelde:RefreshOptions(replacementsTable)
     self:TracePrint("RefreshOptions : DB table:")
     self:TracePrint(replacementsTable)
 
-    if (self.options ~= nil) then
     -- remove all previous replacements from options (not DB), except header and buttons
     local replacements = self.options.args.replacements.args or {}
     for k, _ in pairs(replacements) do
@@ -631,17 +629,14 @@ function Grichelde:RefreshOptions(replacementsTable)
         local _, replNumber = self:SplitOnFirstMatch(replName, "_")
         replacements[replName] = self:CreateMapping(toNumber(replNumber))
     end
-    end
 
 --  self:TracePrint("RefreshOptions : UI options:")
 --  self:TracePrint(replacements)
 end
 
 function Grichelde:RefreshDialog()
-    if (self.dialog ~= nil) then
     self.dialog:ConfigTableChanged(nil, self.name)
 end
-end
 
 function Grichelde:AddEmptyMapping()
     local replacements = self.db.profile.replacements or {}

GricheldeTest.lua

@@ -1,8 +1,8 @@
 -- import addon read namespace from global env
-local _G = _G or getfenv()
+local _G = _G
 local Grichelde = _G.Grichelde or {}
 
-local find, pairs, tSize, cRed, cGreen = Grichelde.F.find, Grichelde.F.pairs, Grichelde.F.tSize, Grichelde.F.cRed, Grichelde.F.cGreen
+local find, pairs, tSize, cRed, cGreen, format = Grichelde.F.find, Grichelde.F.pairs, Grichelde.F.tSize, Grichelde.F.cRed, Grichelde.F.cGreen, Grichelde.F.format
 
 function Grichelde:TestMatch(text, pattern)
     -- disable debug print out for testing
@@ -17,7 +17,6 @@ function Grichelde:TestMatch(text, pattern)
     Grichelde.logLevel = oldLogLevel
 end
 
---- Invoke ingame with /run Grichelde:RunTests()
 function Grichelde:RunTests()
     local function test(name, replacements, testData, replaceEmotes)
         local i, ok, size = 0, 0, tSize(testData)
@@ -776,61 +775,10 @@ function Grichelde:RunTests()
     ok = ok + o
     all = all + a
 
-    o, a = test(
-        "umlauts",
-        {
-            replacement_10 = {
-                order = 10,
-                searchText = "ä",
-                replaceText = "ae",
-                exactCase = false,
-                consolidate = false,
-                matchWhen = 2,
-                stopOnMatch = false,
-            },
-            replacement_11 = {
-                order = 11,
-                searchText = "ö",
-                replaceText = "oe",
-                exactCase = false,
-                consolidate = false,
-                matchWhen = 2,
-                stopOnMatch = false,
-            },
-            replacement_12 = {
-                order = 12,
-                searchText = "ü",
-                replaceText = "ue",
-                exactCase = false,
-                consolidate = true,
-                matchWhen = 2,
-                stopOnMatch = false,
-            },
-            replacement_13 = {
-                order = 13,
-                searchText = "ß",
-                replaceText = "ss",
-                exactCase = false,
-                consolidate = false,
-                matchWhen = 2,
-                stopOnMatch = false,
-            },
-        },
-        {
-            ["Hallä"] = "Hallae",
-            ["Ätsch"] = "Aetsch",
-            ["Hällöluü"] = "Haelloeluue",
-            ["ÜöÄ"] = "UeoeAE",
-            ["Ää"] = "Aeae",
-        }
-    )
-    ok = ok + o
-    all = all + a
-
     if (ok == all) then
         self:PrefixedPrint("All %d tests %s", all, cGreen("passed"))
     else
-        self:PrefixedPrint("%d test%s %s, %d tests %s", all - ok, all - ok > 1 and "s" or "", cRed("failed"), ok, cGreen("passed"))
+        self:PrefixedPrint("%d test %s, %d tests %s", all - ok, cRed("failed"), ok, cGreen("passed"))
     end
 
     -- restore old loglevel

GricheldeUpgrade.lua

@@ -1,9 +1,9 @@
 -- read namespace from global env
-local _G = _G or getfenv()
+local _G = _G
 local Grichelde = _G.Grichelde or {}
 
-local pairs, tClone, find, sub, cGreen, cOrange, cRed, toNumber
+local pairs, tSize, tClone, find, sub, cGreen, cOrange, cRed, toNumber
-    = Grichelde.F.pairs, Grichelde.F.tClone, Grichelde.F.find, Grichelde.F.sub, Grichelde.F.cGreen, Grichelde.F.cOrange, Grichelde.F.cRed, Grichelde.F.toNumber
+    = Grichelde.F.pairs, Grichelde.F.tSize,Grichelde.F.tClone, Grichelde.F.find, Grichelde.F.sub, Grichelde.F.cGreen, Grichelde.F.cOrange, Grichelde.F.cRed, Grichelde.F.toNumber
 
 function Grichelde:Upgrade_To_v060()
     self:PrefixedPrint(self.L.Upgrade_ToVersion, cOrange("0.6.0"))

GricheldeUtils.lua

@@ -1,5 +1,5 @@
 -- import addon read namespace from global env
-local _G = _G or getfenv()
+local _G = _G
 local Grichelde = _G.Grichelde or {}
 
 local type, print, pairs, tSize, select, unpack, find, cGray, cDarkgray, cRed, cPrefix, format, rep, toString
@@ -84,6 +84,12 @@ function Grichelde:SplitOnLastMatch(text, delimPattern, start)
     return left, right or text
 end
 
+--- Splits at last word of a text line
+function Grichelde:TestMatch(text, pattern)
+    local pos1, pos2, left, right = find(text, pattern, 1)
+    self:DebugPrint("TestMatch : pos1: %d, pos2: %d, left: %s, right: %s", pos1, pos2, left, right)
+end
+
 function Grichelde:Format(message, ...)
     if (message == nil) then
         return "<nil>"
@@ -171,7 +177,7 @@ end
 --- Print UI options to chat frame
 function Grichelde:PrintOptions()
     self:PrefixedPrint(cPrefix(self.L.Debug_Options))
-    self:LogPrint(function(...)
+    self:LogPrint(-1, function(...)
         print(cPrefix(self.L.AddonName) .. ":", self:Format(...))
     end, self.options.args.replacements.args)
 end
@@ -179,7 +185,7 @@ end
 --- Print current DB profile
 function Grichelde:PrintProfile()
     self:PrefixedPrint(cPrefix(self.L.Debug_Profile))
-    self:LogPrint(function(...)
+    self:LogPrint(-1, function(...)
         print(cPrefix(self.L.AddonName) .. ":", self:Format(...))
     end, self.db.profile)
 end
@@ -187,7 +193,7 @@ end
 --- Print DB replacements to chat frame
 function Grichelde:PrintMappings()
     self:PrefixedPrint(cPrefix(self.L.Debug_Mappings))
-    self:LogPrint(function(...)
+    self:LogPrint(-1, function(...)
         print(cPrefix(self.L.AddonName) .. ":", self:Format(...))
     end, self.db.profile.replacements)
 end

Libs/AceAddon-3.0/AceAddon-3.0.lua

@@ -28,9 +28,9 @@
 -- end
 -- @class file
 -- @name AceAddon-3.0.lua
--- @release $Id$
+-- @release $Id: AceAddon-3.0.lua 1202 2019-05-15 23:11:22Z nevcairiel $
 
-local MAJOR, MINOR = "AceAddon-3.0", 13
+local MAJOR, MINOR = "AceAddon-3.0", 12
 local AceAddon, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
 
 if not AceAddon then return end -- No Upgrade needed.
@@ -49,6 +49,10 @@ local select, pairs, next, type, unpack = select, pairs, next, type, unpack
 local loadstring, assert, error = loadstring, assert, error
 local setmetatable, getmetatable, rawset, rawget = setmetatable, getmetatable, rawset, rawget
 
+-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
+-- List them here for Mikk's FindGlobals script
+-- GLOBALS: LibStub, IsLoggedIn, geterrorhandler
+
 --[[
 	 xpcall safecall implementation
 ]]
@@ -597,20 +601,10 @@ function AceAddon:IterateAddonStatus() return pairs(self.statuses) end
 function AceAddon:IterateEmbedsOnAddon(addon) return pairs(self.embeds[addon]) end
 function AceAddon:IterateModulesOfAddon(addon) return pairs(addon.modules) end
 
--- Blizzard AddOns which can load very early in the loading process and mess with Ace3 addon loading
-local BlizzardEarlyLoadAddons = {
-	Blizzard_DebugTools = true,
-	Blizzard_TimeManager = true,
-	Blizzard_BattlefieldMap = true,
-	Blizzard_MapCanvas = true,
-	Blizzard_SharedMapDataProviders = true,
-	Blizzard_CombatLog = true,
-}
-
 -- Event Handling
 local function onEvent(this, event, arg1)
-	-- 2020-08-28 nevcairiel - ignore the load event of Blizzard addons which occur early in the loading process
+	-- 2011-08-17 nevcairiel - ignore the load event of Blizzard_DebugTools, so a potential startup error isn't swallowed up
-	if (event == "ADDON_LOADED"  and (arg1 == nil or not BlizzardEarlyLoadAddons[arg1])) or event == "PLAYER_LOGIN" then
+	if (event == "ADDON_LOADED"  and arg1 ~= "Blizzard_DebugTools") or event == "PLAYER_LOGIN" then
 		-- if a addon loads another addon, recursion could happen here, so we need to validate the table on every iteration
 		while(#AceAddon.initializequeue > 0) do
 			local addon = tremove(AceAddon.initializequeue, 1)

Libs/AceConfig-3.0/AceConfig-3.0.lua

@@ -3,7 +3,7 @@
 -- as well as associate it with a slash command.
 -- @class file
 -- @name AceConfig-3.0
--- @release $Id$
+-- @release $Id: AceConfig-3.0.lua 1161 2017-08-12 14:30:16Z funkydude $
 
 --[[
 AceConfig-3.0
@@ -27,7 +27,7 @@ if not AceConfig then return end
 local pcall, error, type, pairs = pcall, error, type, pairs
 
 -- -------------------------------------------------------------------
--- :RegisterOptionsTable(appName, options, slashcmd)
+-- :RegisterOptionsTable(appName, options, slashcmd, persist)
 --
 -- - appName - (string) application name
 -- - options - table or function ref, see AceConfigRegistry

Libs/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.lua

@@ -1,7 +1,7 @@
 --- AceConfigCmd-3.0 handles access to an options table through the "command line" interface via the ChatFrames.
 -- @class file
 -- @name AceConfigCmd-3.0
--- @release $Id$
+-- @release $Id: AceConfigCmd-3.0.lua 1161 2017-08-12 14:30:16Z funkydude $
 
 --[[
 AceConfigCmd-3.0
@@ -37,10 +37,17 @@ local error, assert = error, assert
 -- WoW APIs
 local _G = _G
 
+-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
+-- List them here for Mikk's FindGlobals script
+-- GLOBALS: LibStub, SELECTED_CHAT_FRAME, DEFAULT_CHAT_FRAME
+
+
 local L = setmetatable({}, {	-- TODO: replace with proper locale
 	__index = function(self,k) return k end
 })
 
+
+
 local function print(msg)
 	(SELECTED_CHAT_FRAME or DEFAULT_CHAT_FRAME):AddMessage(msg)
 end
@@ -394,7 +401,7 @@ local function handle(info, inputpos, tab, depth, retfalse)
 		return
 	end
 	
-	local strInput = strsub(info.input,inputpos);
+	local str = strsub(info.input,inputpos);
 	
 	if tab.type=="execute" then
 		------------ execute --------------------------------------------
@@ -407,21 +414,21 @@ local function handle(info, inputpos, tab, depth, retfalse)
 		
 		local res = true
 		if tab.pattern then
-			if type(tab.pattern)~="string" then err(info, inputpos, "'pattern' - expected a string") end
+			if not(type(tab.pattern)=="string") then err(info, inputpos, "'pattern' - expected a string") end
-			if not strmatch(strInput, tab.pattern) then
+			if not strmatch(str, tab.pattern) then
-				usererr(info, inputpos, "'"..strInput.."' - " .. L["invalid input"])
+				usererr(info, inputpos, "'"..str.."' - " .. L["invalid input"])
 				return
 			end
 		end
 		
-		do_final(info, inputpos, tab, "set", strInput)
+		do_final(info, inputpos, tab, "set", str)
 		
 
 	
 	elseif tab.type=="toggle" then
 		------------ toggle --------------------------------------------
 		local b
-		local str = strtrim(strlower(strInput))
+		local str = strtrim(strlower(str))
 		if str=="" then
 			b = callmethod(info, inputpos, tab, "get")
 
@@ -458,9 +465,9 @@ local function handle(info, inputpos, tab, depth, retfalse)
 
 	elseif tab.type=="range" then
 		------------ range --------------------------------------------
-		local val = tonumber(strInput)
+		local val = tonumber(str)
 		if not val then
-			usererr(info, inputpos, "'"..strInput.."' - "..L["expected number"])
+			usererr(info, inputpos, "'"..str.."' - "..L["expected number"])
 			return
 		end
 		if type(info.step)=="number" then
@@ -480,7 +487,7 @@ local function handle(info, inputpos, tab, depth, retfalse)
 	
 	elseif tab.type=="select" then
 		------------ select ------------------------------------
-		local str = strtrim(strlower(strInput))
+		local str = strtrim(strlower(str))
 		
 		local values = tab.values
 		if type(values) == "function" or type(values) == "string" then
@@ -521,7 +528,7 @@ local function handle(info, inputpos, tab, depth, retfalse)
 		
 	elseif tab.type=="multiselect" then
 		------------ multiselect -------------------------------------------
-		local str = strtrim(strlower(strInput))
+		local str = strtrim(strlower(str))
 		
 		local values = tab.values
 		if type(values) == "function" or type(values) == "string" then
@@ -558,7 +565,7 @@ local function handle(info, inputpos, tab, depth, retfalse)
 			
 			--check that the opt is valid
 			local ok
-			for k in pairs(values) do
+			for k,v in pairs(values) do 
 				if strlower(k)==opt then
 					opt = k	-- overwrite with key (in case of case mismatches)
 					ok = true
@@ -627,7 +634,7 @@ local function handle(info, inputpos, tab, depth, retfalse)
 		
 	elseif tab.type=="color" then
 		------------ color --------------------------------------------
-		local str = strtrim(strlower(strInput))
+		local str = strtrim(strlower(str))
 		if str == "" then
 			--TODO: Show current value
 			return
@@ -699,7 +706,7 @@ local function handle(info, inputpos, tab, depth, retfalse)
 
 	elseif tab.type=="keybinding" then
 		------------ keybinding --------------------------------------------
-		local str = strtrim(strlower(strInput))
+		local str = strtrim(strlower(str))
 		if str == "" then
 			--TODO: Show current value
 			return

Libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua

@@ -1,13 +1,13 @@
 --- AceConfigDialog-3.0 generates AceGUI-3.0 based windows based on option tables.
 -- @class file
 -- @name AceConfigDialog-3.0
--- @release $Id$
+-- @release $Id: AceConfigDialog-3.0.lua 1169 2018-02-27 16:18:28Z nevcairiel $
 
 local LibStub = LibStub
 local gui = LibStub("AceGUI-3.0")
 local reg = LibStub("AceConfigRegistry-3.0")
 
-local MAJOR, MINOR = "AceConfigDialog-3.0", 93
+local MAJOR, MINOR = "AceConfigDialog-3.0", 66
 local AceConfigDialog, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
 
 if not AceConfigDialog then return end
@@ -15,20 +15,25 @@ if not AceConfigDialog then return end
 AceConfigDialog.OpenFrames = AceConfigDialog.OpenFrames or {}
 AceConfigDialog.Status = AceConfigDialog.Status or {}
 AceConfigDialog.frame = AceConfigDialog.frame or CreateFrame("Frame")
-AceConfigDialog.tooltip = AceConfigDialog.tooltip or CreateFrame("GameTooltip", "AceConfigDialogTooltip", UIParent, "GameTooltipTemplate")
 
 AceConfigDialog.frame.apps = AceConfigDialog.frame.apps or {}
 AceConfigDialog.frame.closing = AceConfigDialog.frame.closing or {}
 AceConfigDialog.frame.closeAllOverride = AceConfigDialog.frame.closeAllOverride or {}
 
 -- Lua APIs
-local tinsert, tsort, tremove, wipe = table.insert, table.sort, table.remove, table.wipe
+local tconcat, tinsert, tsort, tremove, tsort = table.concat, table.insert, table.sort, table.remove, table.sort
 local strmatch, format = string.match, string.format
-local error = error
+local assert, loadstring, error = assert, loadstring, error
-local pairs, next, select, type, unpack, ipairs = pairs, next, select, type, unpack, ipairs
+local pairs, next, select, type, unpack, wipe, ipairs = pairs, next, select, type, unpack, wipe, ipairs
-local tostring, tonumber = tostring, tonumber
+local rawset, tostring, tonumber = rawset, tostring, tonumber
 local math_min, math_max, math_floor = math.min, math.max, math.floor
 
+-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
+-- List them here for Mikk's FindGlobals script
+-- GLOBALS: NORMAL_FONT_COLOR, GameTooltip, StaticPopupDialogs, ACCEPT, CANCEL, StaticPopup_Show
+-- GLOBALS: PlaySound, GameFontHighlight, GameFontHighlightSmall, GameFontHighlightLarge
+-- GLOBALS: CloseSpecialWindows, InterfaceOptions_AddCategory, geterrorhandler
+
 local emptyTbl = {}
 
 --[[
@@ -40,10 +45,39 @@ local function errorhandler(err)
 	return geterrorhandler()(err)
 end
 
-local function safecall(func, ...)
+local function CreateDispatcher(argCount)
-	if func then
+	local code = [[
-		return xpcall(func, errorhandler, ...)
+		local xpcall, eh = ...
+		local method, ARGS
+		local function call() return method(ARGS) end
+	
+		local function dispatch(func, ...)
+			 method = func
+			 if not method then return end
+			 ARGS = ...
+			 return xpcall(call, eh)
 		end
+	
+		return dispatch
+	]]
+	
+	local ARGS = {}
+	for i = 1, argCount do ARGS[i] = "arg"..i end
+	code = code:gsub("ARGS", tconcat(ARGS, ", "))
+	return assert(loadstring(code, "safecall Dispatcher["..argCount.."]"))(xpcall, errorhandler)
+end
+
+local Dispatchers = setmetatable({}, {__index=function(self, argCount)
+	local dispatcher = CreateDispatcher(argCount)
+	rawset(self, argCount, dispatcher)
+	return dispatcher
+end})
+Dispatchers[0] = function(func)
+	return xpcall(func, errorhandler)
+end
+ 
+local function safecall(func, ...)
+	return Dispatchers[select("#", ...)](func, ...)
 end
 
 local width_multiplier = 170
@@ -147,7 +181,6 @@ local stringIsLiteral = {
 	width = true,
 	image = true,
 	fontSize = true,
-	tooltipHyperlink = true
 }
 
 --Is Never a function or method
@@ -189,8 +222,9 @@ local function GetOptionsMemberValue(membername, option, options, path, appName,
 		--We have a function to call
 		local info = new()
 		--traverse the options table, picking up the handler and filling the info with the path
+		local handler
 		local group = options
-		local handler = group.handler
+		handler = group.handler or handler
 		
 		for i = 1, #path do
 			group = GetSubOption(group, path[i])
@@ -291,7 +325,7 @@ local function compareOptions(a,b)
 		return NameA:upper() < NameB:upper()
 	end
 	if OrderA < 0 then
-		if OrderB >= 0 then
+		if OrderB > 0 then
 			return false
 		end
 	else
@@ -499,17 +533,8 @@ local function OptionOnMouseOver(widget, event)
 	local options = user.options
 	local path = user.path
 	local appName = user.appName
-	local tooltip = AceConfigDialog.tooltip
-
-	tooltip:SetOwner(widget.frame, "ANCHOR_TOPRIGHT")
-
-	local tooltipHyperlink = GetOptionsMemberValue("tooltipHyperlink", opt, options, path, appName)
-	if tooltipHyperlink then
-		tooltip:SetHyperlink(tooltipHyperlink)
-		tooltip:Show()
-		return
-	end
 
+	GameTooltip:SetOwner(widget.frame, "ANCHOR_TOPRIGHT")
 	local name = GetOptionsMemberValue("name", opt, options, path, appName)
 	local desc = GetOptionsMemberValue("desc", opt, options, path, appName)
 	local usage = GetOptionsMemberValue("usage", opt, options, path, appName)
@@ -517,141 +542,98 @@ local function OptionOnMouseOver(widget, event)
 	
 	if descStyle and descStyle ~= "tooltip" then return end
 	
-	tooltip:SetText(name, 1, .82, 0, 1, true)
+	GameTooltip:SetText(name, 1, .82, 0, true)
 	
 	if opt.type == "multiselect" then
-		tooltip:AddLine(user.text, 0.5, 0.5, 0.8, true)
+		GameTooltip:AddLine(user.text, 0.5, 0.5, 0.8, true)
 	end	
 	if type(desc) == "string" then
-		tooltip:AddLine(desc, 1, 1, 1, true)
+		GameTooltip:AddLine(desc, 1, 1, 1, true)
 	end
 	if type(usage) == "string" then
-		tooltip:AddLine(usage, NORMAL_FONT_COLOR.r, NORMAL_FONT_COLOR.g, NORMAL_FONT_COLOR.b, true)
+		GameTooltip:AddLine("Usage: "..usage, NORMAL_FONT_COLOR.r, NORMAL_FONT_COLOR.g, NORMAL_FONT_COLOR.b, true)
 	end
 
-	tooltip:Show()
+	GameTooltip:Show()
 end
 
 local function OptionOnMouseLeave(widget, event)
-	AceConfigDialog.tooltip:Hide()
+	GameTooltip:Hide()
 end
 
 local function GetFuncName(option)
-	if option.type == "execute" then
+	local type = option.type
+	if type == "execute" then
 		return "func"
 	else
 		return "set"
 	end
 end
-do
-	local InCombatLockdown = InCombatLockdown
-	local frame = AceConfigDialog.popup
-	if not frame or oldminor < 93 then
-		frame = CreateFrame("Frame", nil, UIParent)
-		AceConfigDialog.popup = frame
-		frame:Hide()
-		frame:SetPoint("CENTER", UIParent, "CENTER")
-		frame:SetSize(400, 72)
-		frame:EnableMouse(true) -- Do not allow click-through on the frame
-		frame:SetFrameStrata("TOOLTIP")
-		frame:SetFrameLevel(100) -- Lots of room to draw under it
-		frame:SetScript("OnKeyDown", function(self, key)
-			if key == "ESCAPE" then
-				if not InCombatLockdown() then
-					self:SetPropagateKeyboardInput(false)
-				end
-				if self.cancel:IsShown() then
-					self.cancel:Click()
-				else -- Showing a validation error
-					self:Hide()
-				end
-			elseif not InCombatLockdown() then
-				self:SetPropagateKeyboardInput(true)
-			end
-		end)
-
-		local border = CreateFrame("Frame", nil, frame, "DialogBorderOpaqueTemplate")
-		border:SetAllPoints(frame)
-		frame:SetFixedFrameStrata(true)
-		frame:SetFixedFrameLevel(true)
-
-		local text = frame:CreateFontString(nil, "ARTWORK", "GameFontHighlight")
-		text:SetSize(370, 0)
-		text:SetPoint("TOP", 0, -16)
-		frame.text = text
-
-		local function newButton(newText)
-			local button = CreateFrame("Button", nil, frame)
-			button:SetSize(128, 21)
-			button:SetNormalFontObject(GameFontNormal)
-			button:SetHighlightFontObject(GameFontHighlight)
-			button:SetNormalTexture(130763) -- "Interface\\Buttons\\UI-DialogBox-Button-Up"
-			button:GetNormalTexture():SetTexCoord(0.0, 1.0, 0.0, 0.71875)
-			button:SetPushedTexture(130761) -- "Interface\\Buttons\\UI-DialogBox-Button-Down"
-			button:GetPushedTexture():SetTexCoord(0.0, 1.0, 0.0, 0.71875)
-			button:SetHighlightTexture(130762) -- "Interface\\Buttons\\UI-DialogBox-Button-Highlight"
-			button:GetHighlightTexture():SetTexCoord(0.0, 1.0, 0.0, 0.71875)
-			button:SetText(newText)
-			return button
-		end
-
-		local accept = newButton(ACCEPT)
-		accept:SetPoint("BOTTOMRIGHT", frame, "BOTTOM", -6, 16)
-		frame.accept = accept
-
-		local cancel = newButton(CANCEL)
-		cancel:SetPoint("LEFT", accept, "RIGHT", 13, 0)
-		frame.cancel = cancel
-	end
-end
 local function confirmPopup(appName, rootframe, basepath, info, message, func, ...)
-	local frame = AceConfigDialog.popup
+	if not StaticPopupDialogs["ACECONFIGDIALOG30_CONFIRM_DIALOG"] then
-	frame:Show()
+		StaticPopupDialogs["ACECONFIGDIALOG30_CONFIRM_DIALOG"] = {}
-	frame.text:SetText(message)
+	end
-	local height = 70 + frame.text:GetHeight()
+	local t = StaticPopupDialogs["ACECONFIGDIALOG30_CONFIRM_DIALOG"]
-	frame:SetHeight(height)
+	for k in pairs(t) do
-
+		t[k] = nil
-	frame.accept:ClearAllPoints()
+	end
-	frame.accept:SetPoint("BOTTOMRIGHT", frame, "BOTTOM", -6, 16)
+	t.text = message
-	frame.cancel:Show()
+	t.button1 = ACCEPT
-
+	t.button2 = CANCEL
-	local t = {...}
+	t.preferredIndex = STATICPOPUP_NUMDIALOGS
-	local tCount = select("#", ...)
+	local dialog, oldstrata
-	frame.accept:SetScript("OnClick", function(self)
+	t.OnAccept = function()
-		safecall(func, unpack(t, 1, tCount)) -- Manually set count as unpack() stops on nil (bug with #table)
+		safecall(func, unpack(t))
+		if dialog and oldstrata then
+			dialog:SetFrameStrata(oldstrata)
+		end
 		AceConfigDialog:Open(appName, rootframe, unpack(basepath or emptyTbl))
-		frame:Hide()
-		self:SetScript("OnClick", nil)
-		frame.cancel:SetScript("OnClick", nil)
 		del(info)
-	end)
+	end
-	frame.cancel:SetScript("OnClick", function(self)
+	t.OnCancel = function()
+		if dialog and oldstrata then
+			dialog:SetFrameStrata(oldstrata)
+		end
 		AceConfigDialog:Open(appName, rootframe, unpack(basepath or emptyTbl))
-		frame:Hide()
-		self:SetScript("OnClick", nil)
-		frame.accept:SetScript("OnClick", nil)
 		del(info)
-	end)
+	end
+	for i = 1, select("#", ...) do
+		t[i] = select(i, ...) or false
+	end
+	t.timeout = 0
+	t.whileDead = 1
+	t.hideOnEscape = 1
+
+	dialog = StaticPopup_Show("ACECONFIGDIALOG30_CONFIRM_DIALOG")
+	if dialog then
+		oldstrata = dialog:GetFrameStrata()
+		dialog:SetFrameStrata("TOOLTIP")
+	end
 end
 
 local function validationErrorPopup(message)
-	local frame = AceConfigDialog.popup
+	if not StaticPopupDialogs["ACECONFIGDIALOG30_VALIDATION_ERROR_DIALOG"] then
-	frame:Show()
+		StaticPopupDialogs["ACECONFIGDIALOG30_VALIDATION_ERROR_DIALOG"] = {}
-	frame.text:SetText(message)
+	end
-	-- From StaticPopup.lua
+	local t = StaticPopupDialogs["ACECONFIGDIALOG30_VALIDATION_ERROR_DIALOG"]
-	-- local height = 32 + text:GetHeight() + 2;
+	t.text = message
-	-- height = height + 6 + accept:GetHeight()
+	t.button1 = OKAY
-	-- We add 32 + 2 + 6 + 21 (button height) == 61
+	t.preferredIndex = STATICPOPUP_NUMDIALOGS
-	local height = 61 + frame.text:GetHeight()
+	local dialog, oldstrata
-	frame:SetHeight(height)
+	t.OnAccept = function()
+		if dialog and oldstrata then
+			dialog:SetFrameStrata(oldstrata)
+		end
+	end
+	t.timeout = 0
+	t.whileDead = 1
+	t.hideOnEscape = 1
 
-	frame.accept:ClearAllPoints()
+	dialog = StaticPopup_Show("ACECONFIGDIALOG30_VALIDATION_ERROR_DIALOG")
-	frame.accept:SetPoint("BOTTOM", frame, "BOTTOM", 0, 16)
+	if dialog then
-	frame.cancel:Hide()
+		oldstrata = dialog:GetFrameStrata()
-
+		dialog:SetFrameStrata("TOOLTIP")
-	frame.accept:SetScript("OnClick", function()
+	end
-		frame:Hide()
-	end)
 end
 
 local function ActivateControl(widget, event, ...)
@@ -674,7 +656,7 @@ local function ActivateControl(widget, event, ...)
 	if group[funcname] ~= nil then
 		func =  group[funcname]
 	end
-	handler = group.handler
+	handler = group.handler or handler
 	confirm = group.confirm
 	validate = group.validate
 	for i = 1, #path do
@@ -738,6 +720,7 @@ local function ActivateControl(widget, event, ...)
 		end
 	end
 	
+	local rootframe = user.rootframe
 	if not validated or type(validated) == "string" then
 		if not validated then
 			if usage then
@@ -752,8 +735,8 @@ local function ActivateControl(widget, event, ...)
 		end
 
 		-- show validate message
-		if user.rootframe.SetStatusText then
+		if rootframe.SetStatusText then
-			user.rootframe:SetStatusText(validated)
+			rootframe:SetStatusText(validated)
 		else
 			validationErrorPopup(validated)
 		end
@@ -790,14 +773,14 @@ local function ActivateControl(widget, event, ...)
 		if type(confirm) == "boolean" then
 			if confirm then
 				if not confirmText then
-					local option_name, desc = option.name, option.desc
+					local name, desc = option.name, option.desc
-					if type(option_name) == "function" then
+					if type(name) == "function" then
-						option_name = option_name(info)
+						name = name(info)
 					end
 					if type(desc) == "function" then
 						desc = desc(info)
 					end
-					confirmText = option_name
+					confirmText = name
 					if desc then
 						confirmText = confirmText.." - "..desc
 					end
@@ -903,7 +886,7 @@ end
 
 local function MultiControlOnClosed(widget, event, ...)
 	local user = widget:GetUserDataTable()
-	if user.valuechanged and not widget:IsReleasing() then
+	if user.valuechanged then
 		local iscustom = user.rootframe:GetUserData("iscustom")
 		local basepath = user.rootframe:GetUserData("basepath") or emptyTbl
 		if iscustom then
@@ -1079,30 +1062,8 @@ local function InjectInfo(control, options, option, path, rootframe, appName)
 	control:SetCallback("OnRelease", CleanUserData)
 	control:SetCallback("OnLeave", OptionOnMouseLeave)
 	control:SetCallback("OnEnter", OptionOnMouseOver)
-
-	-- forward custom arg data directly
-	if control.SetCustomData and option.arg then
-		safecall(control.SetCustomData, control, option.arg)
-	end
 end
 
-local function CreateControl(userControlType, fallbackControlType)
-	local control
-	if userControlType then
-		control = gui:Create(userControlType)
-		if not control then
-			geterrorhandler()(("Invalid Custom Control Type - %s"):format(tostring(userControlType)))
-		end
-	end
-	if not control then
-		control = gui:Create(fallbackControlType)
-	end
-	return control
-end
-
-local function sortTblAsStrings(x,y)
-	return tostring(x) < tostring(y) -- Support numbers as keys
-end
 
 --[[
 	options - root of the options table being fed
@@ -1144,14 +1105,15 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 				--Control to feed
 				local control
 				
+				local name = GetOptionsMemberValue("name", v, options, path, appName)
+				
 				if v.type == "execute" then
 					
 					local imageCoords = GetOptionsMemberValue("imageCoords",v, options, path, appName)
 					local image, width, height = GetOptionsMemberValue("image",v, options, path, appName)
 					
-					local iconControl = type(image) == "string" or type(image) == "number"
+					if type(image) == "string" or type(image) == "number" then
-					control = CreateControl(v.dialogControl or v.control, iconControl and "Icon" or "Button")
+						control = gui:Create("Icon")
-					if iconControl then
 						if not width then
 							width = GetOptionsMemberValue("imageWidth",v, options, path, appName)
 						end
@@ -1172,12 +1134,18 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 						control:SetImageSize(width, height)
 						control:SetLabel(name)
 					else
+						control = gui:Create("Button")
 						control:SetText(name)
 					end
 					control:SetCallback("OnClick",ActivateControl)
 
 				elseif v.type == "input" then
-					control = CreateControl(v.dialogControl or v.control, v.multiline and "MultiLineEditBox" or "EditBox")
+					local controlType = v.dialogControl or v.control or (v.multiline and "MultiLineEditBox") or "EditBox"
+					control = gui:Create(controlType)
+					if not control then
+						geterrorhandler()(("Invalid Custom Control Type - %s"):format(tostring(controlType)))
+						control = gui:Create(v.multiline and "MultiLineEditBox" or "EditBox")
+					end
 					
 					if v.multiline and control.SetNumLines then
 						control:SetNumLines(tonumber(v.multiline) or 4)
@@ -1191,7 +1159,7 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 					control:SetText(text)
 
 				elseif v.type == "toggle" then
-					control = CreateControl(v.dialogControl or v.control, "CheckBox")
+					control = gui:Create("CheckBox")
 					control:SetLabel(name)
 					control:SetTriState(v.tristate)
 					local value = GetOptionsMemberValue("get",v, options, path, appName)
@@ -1214,7 +1182,7 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 						end
 					end
 				elseif v.type == "range" then
-					control = CreateControl(v.dialogControl or v.control, "Slider")
+					control = gui:Create("Slider")
 					control:SetLabel(name)
 					control:SetSliderValues(v.softMin or v.min or 0, v.softMax or v.max or 100, v.bigStep or v.step or 0)
 					control:SetIsPercent(v.isPercent)
@@ -1228,7 +1196,6 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 
 				elseif v.type == "select" then
 					local values = GetOptionsMemberValue("values", v, options, path, appName)
-					local sorting = GetOptionsMemberValue("sorting", v, options, path, appName)
 					if v.style == "radio" then
 						local disabled = CheckOptionDisabled(v, options, path, appName)
 						local width = GetOptionsMemberValue("width",v,options,path,appName)
@@ -1239,14 +1206,12 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 
 						control:PauseLayout()
 						local optionValue = GetOptionsMemberValue("get",v, options, path, appName)
-						if not sorting then
+						local t = {}
-							sorting = {}
 						for value, text in pairs(values) do
-								sorting[#sorting+1]=value
+							t[#t+1]=value
 						end
-							tsort(sorting, sortTblAsStrings)
+						tsort(t)
-						end
+						for k, value in ipairs(t) do
-						for _, value in ipairs(sorting) do
 							local text = values[value]
 							local radio = gui:Create("CheckBox")
 							radio:SetLabel(text)
@@ -1273,14 +1238,19 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 						control:ResumeLayout()
 						control:DoLayout()
 					else
-						control = CreateControl(v.dialogControl or v.control, "Dropdown")
+						local controlType = v.dialogControl or v.control or "Dropdown"
+						control = gui:Create(controlType)
+						if not control then
+							geterrorhandler()(("Invalid Custom Control Type - %s"):format(tostring(controlType)))
+							control = gui:Create("Dropdown")
+						end
 						local itemType = v.itemControl
 						if itemType and not gui:GetWidgetVersion(itemType) then
 							geterrorhandler()(("Invalid Custom Item Type - %s"):format(tostring(itemType)))
 							itemType = nil
 						end
 						control:SetLabel(name)
-						control:SetList(values, sorting, itemType)
+						control:SetList(values, nil, itemType)
 						local value = GetOptionsMemberValue("get",v, options, path, appName)
 						if not values[value] then
 							value = nil
@@ -1293,6 +1263,8 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 					local values = GetOptionsMemberValue("values", v, options, path, appName)
 					local disabled = CheckOptionDisabled(v, options, path, appName)
 					
+					local controlType = v.dialogControl or v.control
+					
 					local valuesort = new()
 					if values then
 						for value, text in pairs(values) do
@@ -1301,7 +1273,6 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 					end
 					tsort(valuesort)
 					
-					local controlType = v.dialogControl or v.control
 					if controlType then
 						control = gui:Create(controlType)
 						if not control then
@@ -1328,8 +1299,8 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 							control:SetWidth(width_multiplier)
 						end
 						--check:SetTriState(v.tristate)
-						for s = 1, #valuesort do
+						for i = 1, #valuesort do
-							local key = valuesort[s]
+							local key = valuesort[i]
 							local value = GetOptionsMemberValue("get",v, options, path, appName, key)
 							control:SetItemValue(key,value)
 						end
@@ -1341,8 +1312,8 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 
 						control:PauseLayout()
 						local width = GetOptionsMemberValue("width",v,options,path,appName)
-						for s = 1, #valuesort do
+						for i = 1, #valuesort do
-							local value = valuesort[s]
+							local value = valuesort[i]
 							local text = values[value]
 							local check = gui:Create("CheckBox")
 							check:SetLabel(text)
@@ -1359,7 +1330,7 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 							elseif width == "half" then
 								check:SetWidth(width_multiplier / 2)
 							elseif (type(width) == "number") then
-								check:SetWidth(width_multiplier * width)
+								control:SetWidth(width_multiplier * width)
 							elseif width == "full" then
 								check.width = "fill"
 							else
@@ -1375,7 +1346,7 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 					del(valuesort)
 
 				elseif v.type == "color" then
-					control = CreateControl(v.dialogControl or v.control, "ColorPicker")
+					control = gui:Create("ColorPicker")
 					control:SetLabel(name)
 					control:SetHasAlpha(GetOptionsMemberValue("hasAlpha",v, options, path, appName))
 					control:SetColor(GetOptionsMemberValue("get",v, options, path, appName))
@@ -1383,18 +1354,18 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 					control:SetCallback("OnValueConfirmed",ActivateControl)
 
 				elseif v.type == "keybinding" then
-					control = CreateControl(v.dialogControl or v.control, "Keybinding")
+					control = gui:Create("Keybinding")
 					control:SetLabel(name)
 					control:SetKey(GetOptionsMemberValue("get",v, options, path, appName))
 					control:SetCallback("OnKeyChanged",ActivateControl)
 
 				elseif v.type == "header" then
-					control = CreateControl(v.dialogControl or v.control, "Heading")
+					control = gui:Create("Heading")
 					control:SetText(name)
 					control.width = "fill"
 
 				elseif v.type == "description" then
-					control = CreateControl(v.dialogControl or v.control, "Label")
+					control = gui:Create("Label")
 					control:SetText(name)
 					
 					local fontSize = GetOptionsMemberValue("fontSize",v, options, path, appName)
@@ -1429,23 +1400,20 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 						end
 						control:SetImageSize(width, height)
 					end
-					local controlWidth = GetOptionsMemberValue("width",v,options,path,appName)
+					local width = GetOptionsMemberValue("width",v,options,path,appName)
-					control.width = not controlWidth and "fill"
+					control.width = not width and "fill"
 				end
 
 				--Common Init
 				if control then
 					if control.width ~= "fill" then
 						local width = GetOptionsMemberValue("width",v,options,path,appName)
-						local relWidth = GetOptionsMemberValue("relWidth",v,options,path,appName)
 						if width == "double" then
 							control:SetWidth(width_multiplier * 2)
 						elseif width == "half" then
 							control:SetWidth(width_multiplier / 2)
 						elseif (type(width) == "number") then
 							control:SetWidth(width_multiplier * width)
-						elseif width == "relative" and relWidth then
-							control:SetRelativeWidth(relWidth)
 						elseif width == "full" then
 							control.width = "fill"
 						else
@@ -1485,7 +1453,6 @@ local function TreeOnButtonEnter(widget, event, uniquevalue, button)
 	local option = user.option
 	local path = user.path
 	local appName = user.appName
-	local tooltip = AceConfigDialog.tooltip
 	
 	local feedpath = new()
 	for i = 1, #path do
@@ -1502,25 +1469,24 @@ local function TreeOnButtonEnter(widget, event, uniquevalue, button)
 	local name = GetOptionsMemberValue("name", group, options, feedpath, appName)
 	local desc = GetOptionsMemberValue("desc", group, options, feedpath, appName)
 	
-	tooltip:SetOwner(button, "ANCHOR_NONE")
+	GameTooltip:SetOwner(button, "ANCHOR_NONE")
-	tooltip:ClearAllPoints()
 	if widget.type == "TabGroup" then
-		tooltip:SetPoint("BOTTOM",button,"TOP")
+		GameTooltip:SetPoint("BOTTOM",button,"TOP")
 	else
-		tooltip:SetPoint("LEFT",button,"RIGHT")
+		GameTooltip:SetPoint("LEFT",button,"RIGHT")
 	end
 
-	tooltip:SetText(name, 1, .82, 0, 1, true)
+	GameTooltip:SetText(name, 1, .82, 0, true)
 	
 	if type(desc) == "string" then
-		tooltip:AddLine(desc, 1, 1, 1, true)
+		GameTooltip:AddLine(desc, 1, 1, 1, true)
 	end
 	
-	tooltip:Show()
+	GameTooltip:Show()
 end
 
 local function TreeOnButtonLeave(widget, event, value, button)
-	AceConfigDialog.tooltip:Hide()
+	GameTooltip:Hide()
 end
 
 
@@ -1567,6 +1533,10 @@ local function GroupSelected(widget, event, uniquevalue)
 	end
 
 	BuildPath(feedpath, ("\001"):split(uniquevalue))
+	local group = options
+	for i = 1, #feedpath do
+		group = GetSubOption(group, feedpath[i])
+	end
 	widget:ReleaseChildren()
 	AceConfigDialog:FeedGroup(user.appName,options,widget,rootframe,feedpath)
 
@@ -1688,29 +1658,29 @@ function AceConfigDialog:FeedGroup(appName,options,container,rootframe,path, isR
 
 		elseif grouptype == "select" then
 
-			local selectGroup = gui:Create("DropdownGroup")
+			local select = gui:Create("DropdownGroup")
-			selectGroup:SetTitle(name)
+			select:SetTitle(name)
-			InjectInfo(selectGroup, options, group, path, rootframe, appName)
+			InjectInfo(select, options, group, path, rootframe, appName)
-			selectGroup:SetCallback("OnGroupSelected", GroupSelected)
+			select:SetCallback("OnGroupSelected", GroupSelected)
 			local status = AceConfigDialog:GetStatusTable(appName, path)
 			if not status.groups then
 				status.groups = {}
 			end
-			selectGroup:SetStatusTable(status.groups)
+			select:SetStatusTable(status.groups)
 			local grouplist, orderlist = BuildSelect(group, options, path, appName)
-			selectGroup:SetGroupList(grouplist, orderlist)
+			select:SetGroupList(grouplist, orderlist)
-			selectGroup:SetUserData("grouplist", grouplist)
+			select:SetUserData("grouplist", grouplist)
-			selectGroup:SetUserData("orderlist", orderlist)
+			select:SetUserData("orderlist", orderlist)
 
 			local firstgroup = orderlist[1]
 			if firstgroup then
-				selectGroup:SetGroup((GroupExists(appName, options, path,status.groups.selected) and status.groups.selected) or firstgroup)
+				select:SetGroup((GroupExists(appName, options, path,status.groups.selected) and status.groups.selected) or firstgroup)
 			end
 			
-			selectGroup.width = "fill"
+			select.width = "fill"
-			selectGroup.height = "fill"
+			select.height = "fill"
 
-			container:AddChild(selectGroup)
+			container:AddChild(select)
 
 		--assume tree group by default
 		--if parenttype is tree then this group is already a node on that tree
@@ -1938,19 +1908,17 @@ end
 -- convert pre-39 BlizOptions structure to the new format
 if oldminor and oldminor < 39 and AceConfigDialog.BlizOptions then
 	local old = AceConfigDialog.BlizOptions
-	local newOpt = {}
+	local new = {}
 	for key, widget in pairs(old) do
 		local appName = widget:GetUserData("appName")
-		if not newOpt[appName] then newOpt[appName] = {} end
+		if not new[appName] then new[appName] = {} end
-		newOpt[appName][key] = widget
+		new[appName][key] = widget
 	end
-	AceConfigDialog.BlizOptions = newOpt
+	AceConfigDialog.BlizOptions = new
 else
 	AceConfigDialog.BlizOptions = AceConfigDialog.BlizOptions or {}
 end
 
-AceConfigDialog.BlizOptionsIDMap = AceConfigDialog.BlizOptionsIDMap or {}
-
 local function FeedToBlizPanel(widget, event)
 	local path = widget:GetUserData("path")
 	AceConfigDialog:Open(widget:GetUserData("appName"), widget, unpack(path or emptyTbl))
@@ -1972,17 +1940,15 @@ end
 -- has to be a head-level note.
 --
 -- This function returns a reference to the container frame registered with the Interface
--- Options, as well as the registered ID. You can use the ID to open the options with
+-- Options. You can use this reference to open the options with the API function
--- the API function `Settings.OpenToCategory`.
+-- `InterfaceOptionsFrame_OpenToCategory`.
 -- @param appName The application name as given to `:RegisterOptionsTable()`
 -- @param name A descriptive name to display in the options tree (defaults to appName)
 -- @param parent The parent to use in the interface options tree.
 -- @param ... The path in the options table to feed into the interface options panel.
 -- @return The reference to the frame registered into the Interface Options. 
--- @return The category ID to pass to Settings.OpenToCategory
 function AceConfigDialog:AddToBlizOptions(appName, name, parent, ...)
 	local BlizOptions = AceConfigDialog.BlizOptions
-	local BlizOptionsIDMap = AceConfigDialog.BlizOptionsIDMap
 	
 	local key = appName
 	for n = 1, select("#", ...) do
@@ -1996,6 +1962,7 @@ function AceConfigDialog:AddToBlizOptions(appName, name, parent, ...)
 	if not BlizOptions[appName][key] then
 		local group = gui:Create("BlizOptionsGroup")
 		BlizOptions[appName][key] = group
+		group:SetName(name or appName, parent)
 
 		group:SetTitle(name or appName)
 		group:SetUserData("appName", appName)
@@ -2008,33 +1975,8 @@ function AceConfigDialog:AddToBlizOptions(appName, name, parent, ...)
 		end
 		group:SetCallback("OnShow", FeedToBlizPanel)
 		group:SetCallback("OnHide", ClearBlizPanel)
-
+		InterfaceOptions_AddCategory(group.frame)
-		local categoryName = name or appName
+		return group.frame
-		if parent then
-			local parentID = BlizOptionsIDMap[parent] or parent
-			local category = Settings.GetCategory(parentID)
-			if not category then
-				error(("The parent category '%s' was not found"):format(parent), 2)
-			end
-			local subcategory = Settings.RegisterCanvasLayoutSubcategory(category, group.frame, categoryName)
-			group:SetName(subcategory.ID, parentID)
-		else
-			if BlizOptionsIDMap[categoryName] then
-				error(("%s has already been added to the Blizzard Options Window with the given name: %s"):format(appName, categoryName), 2)
-			end
-
-			local category = Settings.RegisterCanvasLayoutCategory(group.frame, categoryName)
-			if not (C_SettingsUtil and C_SettingsUtil.OpenSettingsPanel) then
-				-- override the ID so the name can be used in Settings.OpenToCategory
-				-- unfortunately with incoming API changes in 12.0 (and likely classic at some point) this override is no longer possible
-				category.ID = categoryName
-			end
-			group:SetName(category.ID)
-			BlizOptionsIDMap[categoryName] = category.ID
-			Settings.RegisterAddOnCategory(category)
-		end
-
-		return group.frame, group.frame.name
 	else
 		error(("%s has already been added to the Blizzard Options Window with the given path"):format(appName), 2)
 	end

Libs/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.lua

@@ -8,10 +8,10 @@
 -- :IterateOptionsTables() (and :GetOptionsTable() if only given one argument) return a function reference that the requesting config handling addon must call with valid "uiType", "uiName".
 -- @class file
 -- @name AceConfigRegistry-3.0
--- @release $Id$
+-- @release $Id: AceConfigRegistry-3.0.lua 1169 2018-02-27 16:18:28Z nevcairiel $
 local CallbackHandler = LibStub("CallbackHandler-1.0")
 
-local MAJOR, MINOR = "AceConfigRegistry-3.0", 22
+local MAJOR, MINOR = "AceConfigRegistry-3.0", 18
 local AceConfigRegistry = LibStub:NewLibrary(MAJOR, MINOR)
 
 if not AceConfigRegistry then return end
@@ -59,6 +59,7 @@ local optstring={["nil"]=true,["string"]=true, _="string"}
 local optstringfunc={["nil"]=true,["string"]=true,["function"]=true, _="string or funcref"}
 local optstringnumberfunc={["nil"]=true,["string"]=true,["number"]=true,["function"]=true, _="string, number or funcref"}
 local optnumber={["nil"]=true,["number"]=true, _="number"}
+local optmethod={["nil"]=true,["string"]=true,["function"]=true, _="methodname or funcref"}
 local optmethodfalse={["nil"]=true,["string"]=true,["function"]=true,["boolean"]={[false]=true},  _="methodname, funcref or false"}
 local optmethodnumber={["nil"]=true,["string"]=true,["function"]=true,["number"]=true,  _="methodname, funcref or number"}
 local optmethodtable={["nil"]=true,["string"]=true,["function"]=true,["table"]=true,  _="methodname, funcref or table"}
@@ -83,7 +84,6 @@ local basekeys={
 		dialogHidden=optmethodbool,
 		dropdownHidden=optmethodbool,
 	cmdHidden=optmethodbool,
-	tooltipHyperlink=optstringfunc,
 	icon=optstringnumberfunc,
 	iconCoords=optmethodtable,
 	handler=opttable,
@@ -92,24 +92,16 @@ local basekeys={
 	func=optmethodfalse,
 	arg={["*"]=true},
 	width=optstringnumber,
-	relWidth=optnumber,
 }
 
 local typedkeys={
-	header={
+	header={},
-		control=optstring,
-		dialogControl=optstring,
-		dropdownControl=optstring,
-	},
 	description={
 		image=optstringnumberfunc,
 		imageCoords=optmethodtable,
 		imageHeight=optnumber,
 		imageWidth=optnumber,
 		fontSize=optstringfunc,
-		control=optstring,
-		dialogControl=optstring,
-		dropdownControl=optstring,
 	},
 	group={
 		args=istable,
@@ -126,9 +118,6 @@ local typedkeys={
 		imageCoords=optmethodtable,
 		imageHeight=optnumber,
 		imageWidth=optnumber,
-		control=optstring,
-		dialogControl=optstring,
-		dropdownControl=optstring,
 	},
 	input={
 		pattern=optstring,
@@ -142,9 +131,6 @@ local typedkeys={
 		tristate=optbool,
 		image=optstringnumberfunc,
 		imageCoords=optmethodtable,
-		control=optstring,
-		dialogControl=optstring,
-		dropdownControl=optstring,
 	},
 	tristate={
 	},
@@ -156,13 +142,9 @@ local typedkeys={
 		step=optnumber,
 		bigStep=optnumber,
 		isPercent=optbool,
-		control=optstring,
-		dialogControl=optstring,
-		dropdownControl=optstring,
 	},
 	select={
 		values=ismethodtable,
-		sorting=optmethodtable,
 		style={
 			["nil"]=true, 
 			["string"]={dropdown=true,radio=true}, 
@@ -183,14 +165,9 @@ local typedkeys={
 	},
 	color={
 		hasAlpha=optmethodbool,
-		control=optstring,
-		dialogControl=optstring,
-		dropdownControl=optstring,
 	},
 	keybinding={
-		control=optstring,
+		-- TODO
-		dialogControl=optstring,
-		dropdownControl=optstring,
 	},
 }
 

Libs/AceConsole-3.0/AceConsole-3.0.lua

@@ -9,7 +9,7 @@
 -- make into AceConsole.
 -- @class file
 -- @name AceConsole-3.0
--- @release $Id$
+-- @release $Id: AceConsole-3.0.lua 1202 2019-05-15 23:11:22Z nevcairiel $
 local MAJOR,MINOR = "AceConsole-3.0", 7
 
 local AceConsole, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
@@ -29,6 +29,10 @@ local max = math.max
 -- WoW APIs
 local _G = _G
 
+-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
+-- List them here for Mikk's FindGlobals script
+-- GLOBALS: DEFAULT_CHAT_FRAME, SlashCmdList, hash_SlashCmdList
+
 local tmp={}
 local function Print(self,frame,...)
 	local n=0
@@ -170,7 +174,7 @@ function AceConsole:GetArgs(str, numargs, startpos)
 
 	while true do
 		-- find delimiter or hyperlink
-		local _
+		local ch,_
 		pos,_,ch = strfind(str, delim_or_pipe, pos)
 
 		if not pos then break end

Libs/AceDB-3.0/AceDB-3.0.lua

@@ -40,20 +40,23 @@
 -- end
 -- @class file
 -- @name AceDB-3.0.lua
--- @release $Id$
+-- @release $Id: AceDB-3.0.lua 1142 2016-07-11 08:36:19Z nevcairiel $
-local ACEDB_MAJOR, ACEDB_MINOR = "AceDB-3.0", 40
+local ACEDB_MAJOR, ACEDB_MINOR = "AceDB-3.0", 26
-local AceDB = LibStub:NewLibrary(ACEDB_MAJOR, ACEDB_MINOR)
+local AceDB, oldminor = LibStub:NewLibrary(ACEDB_MAJOR, ACEDB_MINOR)
 
 if not AceDB then return end -- No upgrade needed
 
 -- Lua APIs
 local type, pairs, next, error = type, pairs, next, error
-local setmetatable, rawset, rawget = setmetatable, rawset, rawget
+local setmetatable, getmetatable, rawset, rawget = setmetatable, getmetatable, rawset, rawget
-local strlenutf8 = strlenutf8
 
 -- WoW APIs
 local _G = _G
 
+-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
+-- List them here for Mikk's FindGlobals script
+-- GLOBALS: LibStub
+
 AceDB.db_registry = AceDB.db_registry or {}
 AceDB.frame = AceDB.frame or CreateFrame("Frame")
 
@@ -95,11 +98,11 @@ local function copyDefaults(dest, src)
 				-- This is a metatable used for table defaults
 				local mt = {
 					-- This handles the lookup and creation of new subtables
-					__index = function(t,k2)
+					__index = function(t,k)
-							if k2 == nil then return nil end
+							if k == nil then return nil end
 							local tbl = {}
 							copyDefaults(tbl, v)
-							rawset(t, k2, tbl)
+							rawset(t, k, tbl)
 							return tbl
 						end,
 				}
@@ -112,7 +115,7 @@ local function copyDefaults(dest, src)
 				end
 			else
 				-- Values are not tables, so this is just a simple return
-				local mt = {__index = function(t,k2) return k2~=nil and v or nil end}
+				local mt = {__index = function(t,k) return k~=nil and v or nil end}
 				setmetatable(dest, mt)
 			end
 		elseif type(v) == "table" then
@@ -252,43 +255,17 @@ local preserve_keys = {
 	["children"] = true,
 }
 
+local realmKey = GetRealmName()
+local charKey = UnitName("player") .. " - " .. realmKey
+local _, classKey = UnitClass("player")
+local _, raceKey = UnitRace("player")
 local factionKey = UnitFactionGroup("player")
+local factionrealmKey = factionKey .. " - " .. realmKey
 local localeKey = GetLocale():lower()
-local charKey, realmKey, classKey, raceKey, factionrealmKey, factionrealmregionKey
-do
-	local _
-	_, classKey = UnitClass("player")
-	_, raceKey = UnitRace("player")
-
-	if RegionalUniqueNamesEnabled and RegionalUniqueNamesEnabled() then
-		local isRP = C_GameRules.IsGameRuleActive(Enum.GameRule.RPRuleset)
-		local isPVP = C_GameRules.IsGameRuleActive(Enum.GameRule.PvPRuleset)
-		if C_GameRules.IsGameRuleActive(Enum.GameRule.HardcoreRuleset) then
-			realmKey = "Hardcore"
-		elseif isRP and isPVP then
-			realmKey = "RP-PvP"
-		elseif isRP then
-			realmKey = "RP"
-		elseif isPVP then
-			realmKey = "PvP"
-		else
-			realmKey = "PvE"
-		end
-		local name, surname = UnitNameUnmodified("player")
-		charKey = name .. " " .. surname
-	else
-		realmKey = GetRealmName()
-		charKey = UnitNameUnmodified("player") .. " - " .. realmKey
-	end
 
 local regionTable = { "US", "KR", "EU", "TW", "CN" }
-	local regionName = GetCurrentRegionName()
+local regionKey = regionTable[GetCurrentRegion()]
-	if regionName and regionName == "" then regionName = nil end -- PTR/Beta tends to be ""
+local factionrealmregionKey = factionrealmKey .. " - " .. regionKey
-	local regionKey = regionTable[GetCurrentRegion()] or regionName or "TR"
-
-	factionrealmKey = factionKey .. " - " .. realmKey
-	factionrealmregionKey = factionrealmKey .. " - " .. regionKey
-end
 
 -- Actual database initialization function
 local function initdb(sv, defaults, defaultProfile, olddb, parent)
@@ -302,18 +279,6 @@ local function initdb(sv, defaults, defaultProfile, olddb, parent)
 		-- Make a container for profile keys
 		if not sv.profileKeys then sv.profileKeys = {} end
 
-		-- Validate any existing profile name
-		if sv.profileKeys[charKey] then
-			if type(sv.profileKeys[charKey]) ~= "string" then
-				sv.profileKeys[charKey] = defaultProfile or charKey
-			else
-				local profileNameLength = strlenutf8(sv.profileKeys[charKey])
-				if profileNameLength == 0 or profileNameLength > 50 or sv.profileKeys[charKey]:find("^ +$") then
-					sv.profileKeys[charKey] = defaultProfile or charKey
-				end
-			end
-		end
-
 		-- Try to get the profile selected from the char db
 		profileKey = sv.profileKeys[charKey] or defaultProfile or charKey
 
@@ -399,7 +364,7 @@ local function logoutHandler(frame, event)
 
 			-- cleanup sections that are empty without defaults
 			local sv = rawget(db, "sv")
-			for section in pairs(rawget(db, "keys")) do
+			for section in pairs(db.keys) do
 				if rawget(sv, section) then
 					-- global is special, all other sections have sub-entrys
 					-- also don't delete empty profiles on main dbs, only on namespaces
@@ -416,26 +381,6 @@ local function logoutHandler(frame, event)
 				end
 			end
 		end
-
-		-- second pass after everything else is cleaned up to remove empty namespaces
-		-- can't be run in-loop above since there is no guaranteed order
-		for db in pairs(AceDB.db_registry) do
-			local sv = rawget(db, "sv")
-			local namespaces = rawget(sv, "namespaces")
-			if namespaces then
-				for name in pairs(namespaces) do
-					-- cleanout empty profiles table, if still present
-					if namespaces[name].profiles and not next(namespaces[name].profiles) then
-						namespaces[name].profiles = nil
-					end
-
-					-- remove entire namespace, if needed
-					if not next(namespaces[name]) then
-						namespaces[name] = nil
-					end
-				end
-			end
-		end
 	end
 end
 
@@ -452,7 +397,7 @@ AceDB.frame:SetScript("OnEvent", logoutHandler)
 -- @param defaults A table of defaults for this database
 function DBObjectLib:RegisterDefaults(defaults)
 	if defaults and type(defaults) ~= "table" then
-		error(("Usage: AceDBObject:RegisterDefaults(defaults): 'defaults' - table or nil expected, got %q."):format(type(defaults)), 2)
+		error("Usage: AceDBObject:RegisterDefaults(defaults): 'defaults' - table or nil expected.", 2)
 	end
 
 	validateDefaults(defaults, self.keys)
@@ -484,12 +429,7 @@ end
 -- @param name The name of the profile to set as the current profile
 function DBObjectLib:SetProfile(name)
 	if type(name) ~= "string" then
-		error(("Usage: AceDBObject:SetProfile(name): 'name' - string expected, got %q."):format(type(name)), 2)
+		error("Usage: AceDBObject:SetProfile(name): 'name' - string expected.", 2)
-	else
-		local profileNameLength = strlenutf8(name)
-		if profileNameLength == 0 or profileNameLength > 50 or name:find("^ +$") then
-			error("Usage: AceDBObject:SetProfile(name): 'name' - string length must be between 1 and 50 characters.", 2)
-		end
 	end
 
 	-- changing to the same profile, dont do anything
@@ -531,7 +471,7 @@ end
 -- @param tbl A table to store the profile names in (optional)
 function DBObjectLib:GetProfiles(tbl)
 	if tbl and type(tbl) ~= "table" then
-		error(("Usage: AceDBObject:GetProfiles(tbl): 'tbl' - table or nil expected, got %q."):format(type(tbl)), 2)
+		error("Usage: AceDBObject:GetProfiles(tbl): 'tbl' - table or nil expected.", 2)
 	end
 
 	-- Clear the container table
@@ -569,15 +509,15 @@ end
 -- @param silent If true, do not raise an error when the profile does not exist
 function DBObjectLib:DeleteProfile(name, silent)
 	if type(name) ~= "string" then
-		error(("Usage: AceDBObject:DeleteProfile(name): 'name' - string expected, got %q."):format(type(name)), 2)
+		error("Usage: AceDBObject:DeleteProfile(name): 'name' - string expected.", 2)
 	end
 
 	if self.keys.profile == name then
-		error(("Cannot delete the active profile (%q) in an AceDBObject."):format(name), 2)
+		error("Cannot delete the active profile in an AceDBObject.", 2)
 	end
 
 	if not rawget(self.profiles, name) and not silent then
-		error(("Cannot delete profile %q as it does not exist."):format(name), 2)
+		error("Cannot delete profile '" .. name .. "'. It does not exist.", 2)
 	end
 
 	self.profiles[name] = nil
@@ -589,17 +529,6 @@ function DBObjectLib:DeleteProfile(name, silent)
 		end
 	end
 
-	-- remove from unloaded namespaces
-	if self.sv.namespaces then
-		for nsname, data in pairs(self.sv.namespaces) do
-			if self.children and self.children[nsname] then
-				-- already a mapped namespace
-			elseif data.profiles then
-				data.profiles[name] = nil
-			end
-		end
-	end
-
 	-- switch all characters that use this profile back to the default
 	if self.sv.profileKeys then
 		for key, profile in pairs(self.sv.profileKeys) do
@@ -619,15 +548,15 @@ end
 -- @param silent If true, do not raise an error when the profile does not exist
 function DBObjectLib:CopyProfile(name, silent)
 	if type(name) ~= "string" then
-		error(("Usage: AceDBObject:CopyProfile(name): 'name' - string expected, got %q."):format(type(name)), 2)
+		error("Usage: AceDBObject:CopyProfile(name): 'name' - string expected.", 2)
 	end
 
 	if name == self.keys.profile then
-		error(("Cannot have the same source and destination profiles (%q)."):format(name), 2)
+		error("Cannot have the same source and destination profiles.", 2)
 	end
 
 	if not rawget(self.profiles, name) and not silent then
-		error(("Cannot copy profile %q as it does not exist."):format(name), 2)
+		error("Cannot copy profile '" .. name .. "'. It does not exist.", 2)
 	end
 
 	-- Reset the profile before copying
@@ -645,20 +574,6 @@ function DBObjectLib:CopyProfile(name, silent)
 		end
 	end
 
-	-- copy unloaded namespaces
-	if self.sv.namespaces then
-		for nsname, data in pairs(self.sv.namespaces) do
-			if self.children and self.children[nsname] then
-				-- already a mapped namespace
-			elseif data.profiles then
-				-- reset the current profile
-				data.profiles[self.keys.profile] = {}
-				-- copy data
-				copyTable(data.profiles[name], data.profiles[self.keys.profile])
-			end
-		end
-	end
-
 	-- Callback: OnProfileCopied, database, sourceProfileKey
 	self.callbacks:Fire("OnProfileCopied", self, name)
 end
@@ -685,18 +600,6 @@ function DBObjectLib:ResetProfile(noChildren, noCallbacks)
 		end
 	end
 
-	-- reset unloaded namespaces
-	if self.sv.namespaces and not noChildren then
-		for nsname, data in pairs(self.sv.namespaces) do
-			if self.children and self.children[nsname] then
-				-- already a mapped namespace
-			elseif data.profiles then
-				-- reset the current profile
-				data.profiles[self.keys.profile] = nil
-			end
-		end
-	end
-
 	-- Callback: OnProfileReset, database
 	if not noCallbacks then
 		self.callbacks:Fire("OnProfileReset", self)
@@ -707,8 +610,8 @@ end
 -- profile.
 -- @param defaultProfile The profile name to use as the default
 function DBObjectLib:ResetDB(defaultProfile)
-	if defaultProfile and type(defaultProfile) ~= "string" and defaultProfile ~= true then
+	if defaultProfile and type(defaultProfile) ~= "string" then
-		error(("Usage: AceDBObject:ResetDB(defaultProfile): 'defaultProfile' - string or true expected, got %q."):format(type(defaultProfile)), 2)
+		error("Usage: AceDBObject:ResetDB(defaultProfile): 'defaultProfile' - string or nil expected.", 2)
 	end
 
 	local sv = self.sv
@@ -716,6 +619,8 @@ function DBObjectLib:ResetDB(defaultProfile)
 		sv[k] = nil
 	end
 
+	local parent = self.parent
+
 	initdb(sv, self.defaults, defaultProfile, self)
 
 	-- fix the child namespaces
@@ -742,13 +647,13 @@ end
 -- @param defaults A table of values to use as defaults
 function DBObjectLib:RegisterNamespace(name, defaults)
 	if type(name) ~= "string" then
-		error(("Usage: AceDBObject:RegisterNamespace(name, defaults): 'name' - string expected, got %q."):format(type(name)), 2)
+		error("Usage: AceDBObject:RegisterNamespace(name, defaults): 'name' - string expected.", 2)
 	end
 	if defaults and type(defaults) ~= "table" then
-		error(("Usage: AceDBObject:RegisterNamespace(name, defaults): 'defaults' - table or nil expected, got %q."):format(type(defaults)), 2)
+		error("Usage: AceDBObject:RegisterNamespace(name, defaults): 'defaults' - table or nil expected.", 2)
 	end
 	if self.children and self.children[name] then
-		error(("Usage: AceDBObject:RegisterNamespace(name, defaults): 'name' - a namespace called %q already exists."):format(name), 2)
+		error ("Usage: AceDBObject:RegisterNamespace(name, defaults): 'name' - a namespace with that name already exists.", 2)
 	end
 
 	local sv = self.sv
@@ -772,10 +677,10 @@ end
 -- @return the namespace object if found
 function DBObjectLib:GetNamespace(name, silent)
 	if type(name) ~= "string" then
-		error(("Usage: AceDBObject:GetNamespace(name): 'name' - string expected, got %q."):format(type(name)), 2)
+		error("Usage: AceDBObject:GetNamespace(name): 'name' - string expected.", 2)
 	end
 	if not silent and not (self.children and self.children[name]) then
-		error(("Usage: AceDBObject:GetNamespace(name): 'name' - namespace %q does not exist."):format(name), 2)
+		error ("Usage: AceDBObject:GetNamespace(name): 'name' - namespace does not exist.", 2)
 	end
 	if not self.children then self.children = {} end
 	return self.children[name]
@@ -814,22 +719,15 @@ function AceDB:New(tbl, defaults, defaultProfile)
 	end
 
 	if type(tbl) ~= "table" then
-		error(("Usage: AceDB:New(tbl, defaults, defaultProfile): 'tbl' - table expected, got %q."):format(type(tbl)), 2)
+		error("Usage: AceDB:New(tbl, defaults, defaultProfile): 'tbl' - table expected.", 2)
 	end
 
 	if defaults and type(defaults) ~= "table" then
-		error(("Usage: AceDB:New(tbl, defaults, defaultProfile): 'defaults' - table expected, got %q."):format(type(defaults)), 2)
+		error("Usage: AceDB:New(tbl, defaults, defaultProfile): 'defaults' - table expected.", 2)
 	end
 
-	if defaultProfile then
+	if defaultProfile and type(defaultProfile) ~= "string" and defaultProfile ~= true then
-		if type(defaultProfile) == "string" then
+		error("Usage: AceDB:New(tbl, defaults, defaultProfile): 'defaultProfile' - string or true expected.", 2)
-			local profileNameLength = strlenutf8(defaultProfile)
-			if profileNameLength == 0 or profileNameLength > 50 or defaultProfile:find("^ +$") then
-				error("Usage: AceDB:New(tbl, defaults, defaultProfile): 'defaultProfile' - string length must be between 1 and 50 characters.", 2)
-			end
-		elseif defaultProfile ~= true then
-			error(("Usage: AceDB:New(tbl, defaults, defaultProfile): 'defaultProfile' - string or true expected, got %q."):format(type(defaultProfile)), 2)
-		end
 	end
 
 	return initdb(tbl, defaults, defaultProfile)

Libs/AceDBOptions-3.0/AceDBOptions-3.0.lua

@@ -1,9 +1,9 @@
 --- AceDBOptions-3.0 provides a universal AceConfig options screen for managing AceDB-3.0 profiles.
 -- @class file
 -- @name AceDBOptions-3.0
--- @release $Id$
+-- @release $Id: AceDBOptions-3.0.lua 1140 2016-07-03 07:53:29Z nevcairiel $
-local ACEDBO_MAJOR, ACEDBO_MINOR = "AceDBOptions-3.0", 17
+local ACEDBO_MAJOR, ACEDBO_MINOR = "AceDBOptions-3.0", 15
-local AceDBOptions = LibStub:NewLibrary(ACEDBO_MAJOR, ACEDBO_MINOR)
+local AceDBOptions, oldminor = LibStub:NewLibrary(ACEDBO_MAJOR, ACEDBO_MINOR)
 
 if not AceDBOptions then return end -- No upgrade needed
 
@@ -13,6 +13,10 @@ local pairs, next = pairs, next
 -- WoW APIs
 local UnitClass = UnitClass
 
+-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
+-- List them here for Mikk's FindGlobals script
+-- GLOBALS: NORMAL_FONT_COLOR_CODE, FONT_COLOR_CODE_CLOSE
+
 AceDBOptions.optionTables = AceDBOptions.optionTables or {}
 AceDBOptions.handlers = AceDBOptions.handlers or {}
 
@@ -33,7 +37,6 @@ local L = {
 	delete_desc = "Delete existing and unused profiles from the database to save space, and cleanup the SavedVariables file.",
 	delete_sub = "Deletes a profile from the database.",
 	intro = "You can change the active database profile, so you can have different settings for every character.",
-	name_too_long = "Profile names cannot be longer than 50 characters.",
 	new = "New",
 	new_sub = "Create a new empty profile.",
 	profiles = "Profiles",
@@ -57,7 +60,6 @@ if LOCALE == "deDE" then
 	L["delete_desc"] = "Lösche vorhandene oder unbenutzte Profile aus der Datenbank, um Platz zu sparen und die SavedVariables-Datei 'sauber' zu halten."
 	L["delete_sub"] = "Löscht ein Profil aus der Datenbank."
 	L["intro"] = "Hier kannst du das aktive Datenbankprofil ändern, damit du verschiedene Einstellungen für jeden Charakter erstellen kannst, wodurch eine sehr flexible Konfiguration möglich wird."
-	L["name_too_long"] = "Profilnamen können nicht länger als 50 Zeichen sein."
 	L["new"] = "Neu"
 	L["new_sub"] = "Ein neues Profil erstellen."
 	L["profiles"] = "Profile"
@@ -78,7 +80,6 @@ elseif LOCALE == "frFR" then
 	L["delete_desc"] = "Supprime les profils existants inutilisés de la base de données afin de gagner de la place et de nettoyer le fichier SavedVariables."
 	L["delete_sub"] = "Supprime un profil de la base de données."
 	L["intro"] = "Vous pouvez changer le profil actuel afin d'avoir des paramètres différents pour chaque personnage, permettant ainsi d'avoir une configuration très flexible."
-	L["name_too_long"] = "Les noms de profil ne peuvent pas dépasser 50 caractères."
 	L["new"] = "Nouveau"
 	L["new_sub"] = "Créée un nouveau profil vierge."
 	L["profiles"] = "Profils"
@@ -87,26 +88,25 @@ elseif LOCALE == "frFR" then
 	L["reset_desc"] = "Réinitialise le profil actuel au cas où votre configuration est corrompue ou si vous voulez tout simplement faire table rase."
 	L["reset_sub"] = "Réinitialise le profil actuel avec les paramètres par défaut."
 elseif LOCALE == "koKR" then
-	L["choose"] = "기존 프로필"
+	L["choose"] = "저장 중인 프로필"
-	L["choose_desc"] = "편집 상자에 이름을 입력하여 새로운 프로필을 만들거나 이미 존재하는 프로필 중 하나를 선택할 수 있습니다."
+	L["choose_desc"] = "입력창에 새로운 이름을 입력하거나 저장 중인 프로필 중 하나를 선택하여 새로운 프로필을 만들 수 있습니다."
 	L["choose_sub"] = "현재 이용할 수 있는 프로필 중 하나를 선택합니다."
-	L["copy"] = "복사해 올 프로필"
+	L["copy"] = "복사해오기"
-	L["copy_desc"] = "기존 프로필의 설정을 현재 활성화된 프로필로 복사합니다."
+	L["copy_desc"] = "현재 사용 중인 프로필에 선택한 프로필의 설정을 복사합니다."
 	L["current"] = "현재 프로필:"
 	L["default"] = "기본값"
 	L["delete"] = "프로필 삭제"
-	L["delete_confirm"] = "선택한 프로필을 삭제하시겠습니까?"
+	L["delete_confirm"] = "정말로 선택한 프로필을 삭제할까요?"
-	L["delete_desc"] = "데이터베이스에서 기존 프로필과 사용하지 않는 프로필을 삭제하여 공간을 절약하고 SavedVariables 파일을 정리합니다."
+	L["delete_desc"] = "저장 공간 절약과 SavedVariables 파일의 정리를 위해 데이터베이스에서 사용하지 않는 프로필을 삭제하세요."
-	L["delete_sub"] = "데이터베이스에서 프로필을 삭제합니다."
+	L["delete_sub"] = "데이터베이스의 프로필을 삭제합니다."
-	L["intro"] = "활성 데이터베이스 프로필을 변경할 수 있으며, 모든 캐릭터마다 서로 다른 설정을 지정할 수 있습니다."
+	L["intro"] = "활성 데이터베이스 프로필을 변경할 수 있고, 각 캐릭터 별로 다른 설정을 할 수 있습니다."
-	L["name_too_long"] = "프로필 이름은 50자리를 초과할 수 없습니다."
 	L["new"] = "새로운 프로필"
-	L["new_sub"] = "비어 있는 프로필을 새로 만듭니다."
+	L["new_sub"] = "새로운 프로필을 만듭니다."
 	L["profiles"] = "프로필"
 	L["profiles_sub"] = "프로필 관리"
-	L["reset"] = "프로필 재설정"
+	L["reset"] = "프로필 초기화"
-	L["reset_desc"] = "구성이 손상되었거나 처음부터 다시 시작하고 싶은 경우 현재 프로필을 기본값으로 재설정하세요."
+	L["reset_desc"] = "설정이 깨졌거나 처음부터 다시 설정을 원하는 경우, 현재 프로필을 기본값으로 초기화하세요."
-	L["reset_sub"] = "현재 프로필을 기본값으로 재설정합니다"
+	L["reset_sub"] = "현재 프로필을 기본값으로 초기화합니다"
 elseif LOCALE == "esES" or LOCALE == "esMX" then
 	L["choose"] = "Perfiles existentes"
 	L["choose_desc"] = "Puedes crear un nuevo perfil introduciendo un nombre en el recuadro o puedes seleccionar un perfil de los ya existentes."
@@ -120,7 +120,6 @@ elseif LOCALE == "esES" or LOCALE == "esMX" then
 	L["delete_desc"] = "Borra los perfiles existentes y sin uso de la base de datos para ganar espacio y limpiar el archivo SavedVariables."
 	L["delete_sub"] = "Borra un perfil de la base de datos."
 	L["intro"] = "Puedes cambiar el perfil activo de tal manera que cada personaje tenga diferentes configuraciones."
-	L["name_too_long"] = "Los nombres de perfil no pueden exceder los 50 caracteres."
 	L["new"] = "Nuevo"
 	L["new_sub"] = "Crear un nuevo perfil vacio."
 	L["profiles"] = "Perfiles"
@@ -141,7 +140,6 @@ elseif LOCALE == "zhTW" then
 	L["delete_desc"] = "從資料庫裡刪除不再使用的設定檔，以節省空間，並且清理 SavedVariables 檔案。"
 	L["delete_sub"] = "從資料庫裡刪除一個設定檔。"
 	L["intro"] = "您可以從資料庫中選擇一個設定檔來使用，如此就可以讓每個角色使用不同的設定。"
-	L["name_too_long"] = "設定檔名稱不能超過50個字元。"
 	L["new"] = "新建"
 	L["new_sub"] = "新建一個空的設定檔。"
 	L["profiles"] = "設定檔"
@@ -162,7 +160,6 @@ elseif LOCALE == "zhCN" then
 	L["delete_desc"] = "从数据库里删除不再使用的配置文件，以节省空间，并且清理SavedVariables文件。"
 	L["delete_sub"] = "从数据库里删除一个配置文件。"
 	L["intro"] = "你可以选择一个活动的数据配置文件，这样你的每个角色就可以拥有不同的设置值，可以给你的插件配置带来极大的灵活性。"
-	L["name_too_long"] = "配置文件名称不能超过50个字符。"
 	L["new"] = "新建"
 	L["new_sub"] = "新建一个空的配置文件。"
 	L["profiles"] = "配置文件"
@@ -173,38 +170,36 @@ elseif LOCALE == "zhCN" then
 elseif LOCALE == "ruRU" then
 	L["choose"] = "Существующие профили"
 	L["choose_desc"] = "Вы можете создать новый профиль, введя название в поле ввода, или выбрать один из уже существующих профилей."
-	L["choose_sub"] = "Выбор одного из уже доступных профилей."
+	L["choose_sub"] = "Выбор одиного из уже доступных профилей"
 	L["copy"] = "Скопировать из"
-	L["copy_desc"] = "Копирование настроек из выбранного профиля в активный."
+	L["copy_desc"] = "Скопировать настройки из выбранного профиля в активный."
 	L["current"] = "Текущий профиль:"
 	L["default"] = "По умолчанию"
 	L["delete"] = "Удалить профиль"
-	L["delete_confirm"] = "Вы уверены, что хотите удалить выбранный профиль?"
+	L["delete_confirm"] = "Вы уверены, что вы хотите удалить выбранный профиль?"
-	L["delete_desc"] = "Удаление существующего и неиспользуемого профиля из базы данных для сохранения места, и очистка файла SavedVariables."
+	L["delete_desc"] = "Удалить существующий и неиспользуемый профиль из БД для сохранения места, и очистить SavedVariables файл."
-	L["delete_sub"] = "Удаление профиля из базы данных."
+	L["delete_sub"] = "Удаление профиля из БД"
-	L["intro"] = "Изменяя активный профиль, Вы можете задать разные настройки для каждого персонажа."
+	L["intro"] = "Изменяя активный профиль, вы можете задать различные настройки модификаций для каждого персонажа."
-	L["name_too_long"] = "Имена профилей не могут превышать 50 символов."
 	L["new"] = "Новый"
-	L["new_sub"] = "Создание нового чистого профиля."
+	L["new_sub"] = "Создать новый чистый профиль"
 	L["profiles"] = "Профили"
 	L["profiles_sub"] = "Управление профилями"
-	L["reset"] = "Сбросить профиль"
+	L["reset"] = "Сброс профиля"
-	L["reset_desc"] = "Сброс текущего профиля к стандартным настройкам, если Ваша конфигурация испорчена или Вы хотите настроить все заново."
+	L["reset_desc"] = "Сбросить текущий профиль к стандартным настройкам, если ваша конфигурация испорчена или вы хотите настроить всё заново."
 	L["reset_sub"] = "Сброс текущего профиля на стандартный"
 elseif LOCALE == "itIT" then
 	L["choose"] = "Profili Esistenti"
 	L["choose_desc"] = "Puoi creare un nuovo profilo digitando il nome della casella di testo, oppure scegliendone uno tra i profili già esistenti."
 	L["choose_sub"] = "Seleziona uno dei profili attualmente disponibili."
 	L["copy"] = "Copia Da"
-	L["copy_desc"] = "Copia le impostazioni da un profilo esistente nel profilo attivo in questo momento."
+	L["copy_desc"] = "Copia le impostazioni da un profilo esistente, nel profilo attivo in questo momento."
 	L["current"] = "Profilo Attivo:"
-	L["default"] = "Predefinito"
+	L["default"] = "Standard"
 	L["delete"] = "Cancella un Profilo"
 	L["delete_confirm"] = "Sei sicuro di voler cancellare il profilo selezionato?"
 	L["delete_desc"] = "Cancella i profili non utilizzati dal database per risparmiare spazio e mantenere puliti i file di configurazione SavedVariables."
 	L["delete_sub"] = "Cancella un profilo dal Database."
 	L["intro"] = "Puoi cambiare il profilo attivo, in modo da usare impostazioni diverse per ogni personaggio."
-	L["name_too_long"] = "Il nome del profilo non può superare i 50 caratteri."
 	L["new"] = "Nuovo"
 	L["new_sub"] = "Crea un nuovo profilo vuoto."
 	L["profiles"] = "Profili"
@@ -225,7 +220,6 @@ elseif LOCALE == "ptBR" then
 	L["delete_desc"] = "Remove perfis existentes e inutilizados do banco de dados para economizar espaço, e limpar o arquivo SavedVariables."
 	L["delete_sub"] = "Remove um perfil do banco de dados."
 	L["intro"] = "Você pode alterar o perfil do banco de dados ativo, para que possa ter definições diferentes para cada personagem."
-	L["name_too_long"] = "O nome do perfil não pode exceder 50 caracteres."
 	L["new"] = "Novo"
 	L["new_sub"] = "Cria um novo perfil vazio."
 	L["profiles"] = "Perfis"
@@ -356,7 +350,6 @@ end
 --[[
 	the real options table 
 ]]
-local strlenutf8 = strlenutf8
 local optionsTable = {
 	desc = {
 		order = 1,
@@ -393,15 +386,6 @@ local optionsTable = {
 		order = 30,
 		get = false,
 		set = "SetProfile",
-		usage = L["name_too_long"],
-		validate = function(_, text)
-			local length = strlenutf8(text)
-			if length > 50 or length == 0 or text:find("^ +$") then
-				return false
-			end
-			return true
-		end,
-		width = 2,
 	},
 	choose = {
 		name = L["choose"],
@@ -412,7 +396,6 @@ local optionsTable = {
 		set = "SetProfile",
 		values = "ListProfiles",
 		arg = "common",
-		width = 2,
 	},
 	copydesc = {
 		order = 50,
@@ -429,7 +412,6 @@ local optionsTable = {
 		values = "ListProfiles",
 		disabled = "HasNoProfiles",
 		arg = "nocurrent",
-		width = 2,
 	},
 	deldesc = {
 		order = 70,
@@ -448,7 +430,6 @@ local optionsTable = {
 		arg = "nocurrent",
 		confirm = true,
 		confirmText = L["delete_confirm"],
-		width = 2,
 	},
 }
 

Libs/AceEvent-3.0/AceEvent-3.0.lua

@@ -9,7 +9,7 @@
 -- make into AceEvent.
 -- @class file
 -- @name AceEvent-3.0
--- @release $Id$
+-- @release $Id: AceEvent-3.0.lua 1202 2019-05-15 23:11:22Z nevcairiel $
 local CallbackHandler = LibStub("CallbackHandler-1.0")
 
 local MAJOR, MINOR = "AceEvent-3.0", 4

Libs/AceGUI-3.0/AceGUI-3.0.lua

@@ -24,22 +24,28 @@
 -- f:AddChild(btn)
 -- @class file
 -- @name AceGUI-3.0
--- @release $Id$
+-- @release $Id: AceGUI-3.0.lua 1228 2019-09-06 08:51:17Z nevcairiel $
-local ACEGUI_MAJOR, ACEGUI_MINOR = "AceGUI-3.0", 41
+local ACEGUI_MAJOR, ACEGUI_MINOR = "AceGUI-3.0", 40
 local AceGUI, oldminor = LibStub:NewLibrary(ACEGUI_MAJOR, ACEGUI_MINOR)
 
 if not AceGUI then return end -- No upgrade needed
 
 -- Lua APIs
-local tinsert, wipe = table.insert, table.wipe
+local tinsert = table.insert
 local select, pairs, next, type = select, pairs, next, type
 local error, assert = error, assert
 local setmetatable, rawget = setmetatable, rawget
-local math_max, math_min, math_ceil = math.max, math.min, math.ceil
+local math_max = math.max
 
 -- WoW APIs
 local UIParent = UIParent
 
+-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
+-- List them here for Mikk's FindGlobals script
+-- GLOBALS: geterrorhandler, LibStub
+
+--local con = LibStub("AceConsole-3.0",true)
+
 AceGUI.WidgetRegistry = AceGUI.WidgetRegistry or {}
 AceGUI.LayoutRegistry = AceGUI.LayoutRegistry or {}
 AceGUI.WidgetBase = AceGUI.WidgetBase or {}
@@ -88,38 +94,38 @@ do
 	AceGUI.objPools = AceGUI.objPools or {}
 	local objPools = AceGUI.objPools
 	--Returns a new instance, if none are available either returns a new table or calls the given contructor
-	function newWidget(widgetType)
+	function newWidget(type)
-		if not WidgetRegistry[widgetType] then
+		if not WidgetRegistry[type] then
 			error("Attempt to instantiate unknown widget type", 2)
 		end
 
-		if not objPools[widgetType] then
+		if not objPools[type] then
-			objPools[widgetType] = {}
+			objPools[type] = {}
 		end
 
-		local newObj = next(objPools[widgetType])
+		local newObj = next(objPools[type])
 		if not newObj then
-			newObj = WidgetRegistry[widgetType]()
+			newObj = WidgetRegistry[type]()
-			newObj.AceGUIWidgetVersion = WidgetVersions[widgetType]
+			newObj.AceGUIWidgetVersion = WidgetVersions[type]
 		else
-			objPools[widgetType][newObj] = nil
+			objPools[type][newObj] = nil
 			-- if the widget is older then the latest, don't even try to reuse it
 			-- just forget about it, and grab a new one.
-			if not newObj.AceGUIWidgetVersion or newObj.AceGUIWidgetVersion < WidgetVersions[widgetType] then
+			if not newObj.AceGUIWidgetVersion or newObj.AceGUIWidgetVersion < WidgetVersions[type] then
-				return newWidget(widgetType)
+				return newWidget(type)
 			end
 		end
 		return newObj
 	end
 	-- Releases an instance to the Pool
-	function delWidget(obj,widgetType)
+	function delWidget(obj,type)
-		if not objPools[widgetType] then
+		if not objPools[type] then
-			objPools[widgetType] = {}
+			objPools[type] = {}
 		end
-		if objPools[widgetType][obj] then
+		if objPools[type][obj] then
 			error("Attempt to Release Widget that is already released", 2)
 		end
-		objPools[widgetType][obj] = true
+		objPools[type][obj] = true
 	end
 end
 
@@ -135,9 +141,9 @@ end
 -- OnAcquire function on it, before returning.
 -- @param type The type of the widget.
 -- @return The newly created widget.
-function AceGUI:Create(widgetType)
+function AceGUI:Create(type)
-	if WidgetRegistry[widgetType] then
+	if WidgetRegistry[type] then
-		local widget = newWidget(widgetType)
+		local widget = newWidget(type)
 
 		if rawget(widget, "Acquire") then
 			widget.OnAcquire = widget.Acquire
@@ -155,7 +161,7 @@ function AceGUI:Create(widgetType)
 		if widget.OnAcquire then
 			widget:OnAcquire()
 		else
-			error(("Widget type %s doesn't supply an OnAcquire Function"):format(widgetType))
+			error(("Widget type %s doesn't supply an OnAcquire Function"):format(type))
 		end
 		-- Set the default Layout ("List")
 		safecall(widget.SetLayout, widget, "List")
@@ -206,22 +212,6 @@ function AceGUI:Release(widget)
 	delWidget(widget, widget.type)
 end
 
---- Check if a widget is currently in the process of being released
--- This function check if this widget, or any of its parents (in which case it'll be released shortly as well)
--- are currently being released. This allows addon to handle any callbacks accordingly.
--- @param widget The widget to check
-function AceGUI:IsReleasing(widget)
-	if widget.isQueuedForRelease then
-		return true
-	end
-
-	if widget.parent and widget.parent.AceGUIWidgetVersion then
-		return AceGUI:IsReleasing(widget.parent)
-	end
-
-	return false
-end
-
 -----------
 -- Focus --
 -----------
@@ -348,10 +338,6 @@ do
 		AceGUI:Release(self)
 	end
 
-	WidgetBase.IsReleasing = function(self)
-		return AceGUI:IsReleasing(self)
-	end
-
 	WidgetBase.SetPoint = function(self, ...)
 		return self.frame:SetPoint(...)
 	end
@@ -583,25 +569,25 @@ AceGUI.counts = AceGUI.counts or {}
 -- This is used by widgets that require a named frame, e.g. when a Blizzard
 -- Template requires it.
 -- @param type The widget type
-function AceGUI:GetNextWidgetNum(widgetType)
+function AceGUI:GetNextWidgetNum(type)
-	if not self.counts[widgetType] then
+	if not self.counts[type] then
-		self.counts[widgetType] = 0
+		self.counts[type] = 0
 	end
-	self.counts[widgetType] = self.counts[widgetType] + 1
+	self.counts[type] = self.counts[type] + 1
-	return self.counts[widgetType]
+	return self.counts[type]
 end
 
 --- Return the number of created widgets for this type.
 -- In contrast to GetNextWidgetNum, the number is not incremented.
--- @param widgetType The widget type
+-- @param type The widget type
-function AceGUI:GetWidgetCount(widgetType)
+function AceGUI:GetWidgetCount(type)
-	return self.counts[widgetType] or 0
+	return self.counts[type] or 0
 end
 
 --- Return the version of the currently registered widget type.
--- @param widgetType The widget type
+-- @param type The widget type
-function AceGUI:GetWidgetVersion(widgetType)
+function AceGUI:GetWidgetVersion(type)
-	return WidgetVersions[widgetType]
+	return WidgetVersions[type]
 end
 
 -------------
@@ -764,6 +750,7 @@ AceGUI:RegisterLayout("Flow",
 
 				usedwidth = 0
 				rowstart = frame
+				rowstartoffset = frameoffset
 
 				if child.DoLayout then
 					child:DoLayout()
@@ -806,8 +793,7 @@ local GetCellAlign = function (dir, tableObj, colObj, cellObj, cell, child)
 			or colObj and (colObj["align" .. dir] or colObj.align)
 			or tableObj["align" .. dir] or tableObj.align
 			or "CENTERLEFT"
-	local val
+	local child, cell, val = child or 0, cell or 0, nil
-	child, cell = child or 0, cell or 0
 
 	if type(fn) == "string" then
 		fn = fn:lower()
@@ -821,7 +807,7 @@ local GetCellAlign = function (dir, tableObj, colObj, cellObj, cell, child)
 		val = fn
 	end
 
-	return fn, math_max(0, math_min(val, cell))
+	return fn, max(0, min(val, cell))
 end
 
 -- Get width or height for multiple cells combined
@@ -830,7 +816,7 @@ local GetCellDimension = function (dir, laneDim, from, to, space)
 	for cell=from,to do
 		dim = dim + (laneDim[cell] or 0)
 	end
-	return dim + math_max(0, to - from) * (space or 0)
+	return dim + max(0, to - from) * (space or 0)
 end
 
 --[[ Options
@@ -876,7 +862,7 @@ AceGUI:RegisterLayout("Table",
 				repeat
 					n = n + 1
 					local col = (n - 1) % #cols + 1
-					local row = math_ceil(n / #cols)
+					local row = ceil(n / #cols)
 					local rowspan = rowspans[col]
 					local cell = rowspan and rowspan.child or child
 					local cellObj = cell:GetUserData("cell")
@@ -892,7 +878,7 @@ AceGUI:RegisterLayout("Table",
 					end
 
 					-- Colspan
-					local colspan = math_max(0, math_min((cellObj and cellObj.colspan or 1) - 1, #cols - col))
+					local colspan = max(0, min((cellObj and cellObj.colspan or 1) - 1, #cols - col))
 					n = n + colspan
 
 					-- Place the cell
@@ -909,7 +895,7 @@ AceGUI:RegisterLayout("Table",
 			end
 		end
 
-		local rows = math_ceil(n / #cols)
+		local rows = ceil(n / #cols)
 
 		-- Determine fixed size cols and collect weights
 		local extantH, totalWeight = totalH, 0
@@ -934,16 +920,16 @@ AceGUI:RegisterLayout("Table",
 							f:ClearAllPoints()
 							local childH = f:GetWidth() or 0
 
-							laneH[col] = math_max(laneH[col], childH - GetCellDimension("H", laneH, colStart[child], col - 1, spaceH))
+							laneH[col] = max(laneH[col], childH - GetCellDimension("H", laneH, colStart[child], col - 1, spaceH))
 						end
 					end
 
-					laneH[col] = math_max(colObj.min or colObj[1] or 0, math_min(laneH[col], colObj.max or colObj[2] or laneH[col]))
+					laneH[col] = max(colObj.min or colObj[1] or 0, min(laneH[col], colObj.max or colObj[2] or laneH[col]))
 				else
 					-- Rel./Abs. width
 					laneH[col] = colObj.width < 1 and colObj.width * totalH or colObj.width
 				end
-				extantH = math_max(0, extantH - laneH[col])
+				extantH = max(0, extantH - laneH[col])
 			end
 		end
 
@@ -982,7 +968,7 @@ AceGUI:RegisterLayout("Table",
 						child:DoLayout()
 					end
 
-					rowV = math_max(rowV, (f:GetHeight() or 0) - GetCellDimension("V", laneV, rowStart[child], row - 1, spaceV))
+					rowV = max(rowV, (f:GetHeight() or 0) - GetCellDimension("V", laneV, rowStart[child], row - 1, spaceV))
 				end
 			end
 

Libs/AceGUI-3.0/widgets/AceGUIContainer-BlizOptionsGroup.lua

@@ -2,7 +2,7 @@
 BlizOptionsGroup Container
 Simple container widget for the integration of AceGUI into the Blizzard Interface Options
 -------------------------------------------------------------------------------]]
-local Type, Version = "BlizOptionsGroup", 26
+local Type, Version = "BlizOptionsGroup", 21
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -99,7 +99,7 @@ local methods = {
 Constructor
 -------------------------------------------------------------------------------]]
 local function Constructor()
-	local frame = CreateFrame("Frame", nil, InterfaceOptionsFramePanelContainer)
+	local frame = CreateFrame("Frame")
 	frame:Hide()
 
 	-- support functions for the Blizzard Interface Options
@@ -108,11 +108,6 @@ local function Constructor()
 	frame.default = default
 	frame.refresh = refresh
 
-	-- 10.0 support function aliases (cancel has been removed)
-	frame.OnCommit = okay
-	frame.OnDefault = default
-	frame.OnRefresh = refresh
-
 	frame:SetScript("OnHide", OnHide)
 	frame:SetScript("OnShow", OnShow)
 

Libs/AceGUI-3.0/widgets/AceGUIContainer-DropDownGroup.lua

@@ -2,7 +2,7 @@
 DropdownGroup Container
 Container controlled by a dropdown on the top.
 -------------------------------------------------------------------------------]]
-local Type, Version = "DropdownGroup", 22
+local Type, Version = "DropdownGroup", 21
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -125,7 +125,7 @@ local function Constructor()
 	dropdown.frame:Show()
 	dropdown:SetLabel("")
 
-	local border = CreateFrame("Frame", nil, frame, "BackdropTemplate")
+	local border = CreateFrame("Frame", nil, frame)
 	border:SetPoint("TOPLEFT", 0, -26)
 	border:SetPoint("BOTTOMRIGHT", 0, 3)
 	border:SetBackdrop(PaneBackdrop)

Libs/AceGUI-3.0/widgets/AceGUIContainer-Frame.lua

@@ -1,7 +1,7 @@
 --[[-----------------------------------------------------------------------------
 Frame Container
 -------------------------------------------------------------------------------]]
-local Type, Version = "Frame", 30
+local Type, Version = "Frame", 26
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -13,6 +13,10 @@ local wipe = table.wipe
 local PlaySound = PlaySound
 local CreateFrame, UIParent = CreateFrame, UIParent
 
+-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
+-- List them here for Mikk's FindGlobals script
+-- GLOBALS: CLOSE
+
 --[[-----------------------------------------------------------------------------
 Scripts
 -------------------------------------------------------------------------------]]
@@ -79,7 +83,6 @@ local methods = {
 	["OnAcquire"] = function(self)
 		self.frame:SetParent(UIParent)
 		self.frame:SetFrameStrata("FULLSCREEN_DIALOG")
-		self.frame:SetFrameLevel(100) -- Lots of room to draw under it
 		self:SetTitle()
 		self:SetStatusText()
 		self:ApplyStatus()
@@ -176,21 +179,16 @@ local PaneBackdrop  = {
 }
 
 local function Constructor()
-	local frame = CreateFrame("Frame", nil, UIParent, "BackdropTemplate")
+	local frame = CreateFrame("Frame", nil, UIParent)
 	frame:Hide()
 
 	frame:EnableMouse(true)
 	frame:SetMovable(true)
 	frame:SetResizable(true)
 	frame:SetFrameStrata("FULLSCREEN_DIALOG")
-	frame:SetFrameLevel(100) -- Lots of room to draw under it
 	frame:SetBackdrop(FrameBackdrop)
 	frame:SetBackdropColor(0, 0, 0, 1)
-	if frame.SetResizeBounds then -- WoW 10.0
-		frame:SetResizeBounds(400, 200)
-	else
 	frame:SetMinResize(400, 200)
-	end
 	frame:SetToplevel(true)
 	frame:SetScript("OnShow", Frame_OnShow)
 	frame:SetScript("OnHide", Frame_OnClose)
@@ -203,7 +201,7 @@ local function Constructor()
 	closebutton:SetWidth(100)
 	closebutton:SetText(CLOSE)
 
-	local statusbg = CreateFrame("Button", nil, frame, "BackdropTemplate")
+	local statusbg = CreateFrame("Button", nil, frame)
 	statusbg:SetPoint("BOTTOMLEFT", 15, 15)
 	statusbg:SetPoint("BOTTOMRIGHT", -132, 15)
 	statusbg:SetHeight(24)
@@ -271,7 +269,7 @@ local function Constructor()
 	line2:SetHeight(8)
 	line2:SetPoint("BOTTOMRIGHT", -8, 8)
 	line2:SetTexture(137057) -- Interface\\Tooltips\\UI-Tooltip-Border
-	x = 0.1 * 8/17
+	local x = 0.1 * 8/17
 	line2:SetTexCoord(0.05 - x, 0.5, 0.05, 0.5 + x, 0.05, 0.5 - x, 0.5 + x, 0.5)
 
 	local sizer_s = CreateFrame("Frame", nil, frame)

Libs/AceGUI-3.0/widgets/AceGUIContainer-InlineGroup.lua

@@ -2,7 +2,7 @@
 InlineGroup Container
 Simple container widget that creates a visible "box" with an optional title.
 -------------------------------------------------------------------------------]]
-local Type, Version = "InlineGroup", 22
+local Type, Version = "InlineGroup", 21
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -75,7 +75,7 @@ local function Constructor()
 	titletext:SetJustifyH("LEFT")
 	titletext:SetHeight(18)
 
-	local border = CreateFrame("Frame", nil, frame, "BackdropTemplate")
+	local border = CreateFrame("Frame", nil, frame)
 	border:SetPoint("TOPLEFT", 0, -17)
 	border:SetPoint("BOTTOMRIGHT", -1, 3)
 	border:SetBackdrop(PaneBackdrop)

Libs/AceGUI-3.0/widgets/AceGUIContainer-TabGroup.lua

@@ -2,18 +2,22 @@
 TabGroup Container
 Container that uses tabs on top to switch between groups.
 -------------------------------------------------------------------------------]]
-local Type, Version = "TabGroup", 38
+local Type, Version = "TabGroup", 36
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
 -- Lua APIs
-local pairs, ipairs, assert, type, wipe = pairs, ipairs, assert, type, table.wipe
+local pairs, ipairs, assert, type, wipe = pairs, ipairs, assert, type, wipe
 
 -- WoW APIs
 local PlaySound = PlaySound
 local CreateFrame, UIParent = CreateFrame, UIParent
 local _G = _G
 
+-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
+-- List them here for Mikk's FindGlobals script
+-- GLOBALS: PanelTemplates_TabResize, PanelTemplates_SetDisabledTabState, PanelTemplates_SelectTab, PanelTemplates_DeselectTab
+
 -- local upvalue storage used by BuildTabs
 local widths = {}
 local rowwidths = {}
@@ -22,143 +26,6 @@ local rowends = {}
 --[[-----------------------------------------------------------------------------
 Support functions
 -------------------------------------------------------------------------------]]
-
-local function PanelTemplates_TabResize(tab, padding, absoluteSize, minWidth, maxWidth, absoluteTextSize)
-	local tabName = tab:GetName();
-
-	local buttonMiddle = tab.Middle or tab.middleTexture or _G[tabName.."Middle"];
-	local buttonMiddleDisabled = tab.MiddleDisabled or (tabName and _G[tabName.."MiddleDisabled"]);
-	local left = tab.Left or tab.leftTexture or _G[tabName.."Left"];
-	local sideWidths = 2 * left:GetWidth();
-	local tabText = tab.Text or _G[tab:GetName().."Text"];
-	local highlightTexture = tab.HighlightTexture or (tabName and _G[tabName.."HighlightTexture"]);
-
-	local width, tabWidth;
-	local textWidth;
-	if ( absoluteTextSize ) then
-		textWidth = absoluteTextSize;
-	else
-		tabText:SetWidth(0);
-		textWidth = tabText:GetWidth();
-	end
-	-- If there's an absolute size specified then use it
-	if ( absoluteSize ) then
-		if ( absoluteSize < sideWidths) then
-			width = 1;
-			tabWidth = sideWidths
-		else
-			width = absoluteSize - sideWidths;
-			tabWidth = absoluteSize
-		end
-		tabText:SetWidth(width);
-	else
-		-- Otherwise try to use padding
-		if ( padding ) then
-			width = textWidth + padding;
-		else
-			width = textWidth + 24;
-		end
-		-- If greater than the maxWidth then cap it
-		if ( maxWidth and width > maxWidth ) then
-			if ( padding ) then
-				width = maxWidth + padding;
-			else
-				width = maxWidth + 24;
-			end
-			tabText:SetWidth(width);
-		else
-			tabText:SetWidth(0);
-		end
-		if (minWidth and width < minWidth) then
-			width = minWidth;
-		end
-		tabWidth = width + sideWidths;
-	end
-
-	if ( buttonMiddle ) then
-		buttonMiddle:SetWidth(width);
-	end
-	if ( buttonMiddleDisabled ) then
-		buttonMiddleDisabled:SetWidth(width);
-	end
-
-	tab:SetWidth(tabWidth);
-
-	if ( highlightTexture ) then
-		highlightTexture:SetWidth(tabWidth);
-	end
-end
-
-local function PanelTemplates_DeselectTab(tab)
-	local name = tab:GetName();
-
-	local left = tab.Left or _G[name.."Left"];
-	local middle = tab.Middle or _G[name.."Middle"];
-	local right = tab.Right or _G[name.."Right"];
-	left:Show();
-	middle:Show();
-	right:Show();
-	--tab:UnlockHighlight();
-	tab:Enable();
-	local text = tab.Text or _G[name.."Text"];
-	text:SetPoint("CENTER", tab, "CENTER", (tab.deselectedTextX or 0), (tab.deselectedTextY or 2));
-
-	local leftDisabled = tab.LeftDisabled or _G[name.."LeftDisabled"];
-	local middleDisabled = tab.MiddleDisabled or _G[name.."MiddleDisabled"];
-	local rightDisabled = tab.RightDisabled or _G[name.."RightDisabled"];
-	leftDisabled:Hide();
-	middleDisabled:Hide();
-	rightDisabled:Hide();
-end
-
-local function PanelTemplates_SelectTab(tab)
-	local name = tab:GetName();
-
-	local left = tab.Left or _G[name.."Left"];
-	local middle = tab.Middle or _G[name.."Middle"];
-	local right = tab.Right or _G[name.."Right"];
-	left:Hide();
-	middle:Hide();
-	right:Hide();
-	--tab:LockHighlight();
-	tab:Disable();
-	tab:SetDisabledFontObject(GameFontHighlightSmall);
-	local text = tab.Text or _G[name.."Text"];
-	text:SetPoint("CENTER", tab, "CENTER", (tab.selectedTextX or 0), (tab.selectedTextY or -3));
-
-	local leftDisabled = tab.LeftDisabled or _G[name.."LeftDisabled"];
-	local middleDisabled = tab.MiddleDisabled or _G[name.."MiddleDisabled"];
-	local rightDisabled = tab.RightDisabled or _G[name.."RightDisabled"];
-	leftDisabled:Show();
-	middleDisabled:Show();
-	rightDisabled:Show();
-
-	if GameTooltip:IsOwned(tab) then
-		GameTooltip:Hide();
-	end
-end
-
-local function PanelTemplates_SetDisabledTabState(tab)
-	local name = tab:GetName();
-	local left = tab.Left or _G[name.."Left"];
-	local middle = tab.Middle or _G[name.."Middle"];
-	local right = tab.Right or _G[name.."Right"];
-	left:Show();
-	middle:Show();
-	right:Show();
-	--tab:UnlockHighlight();
-	tab:Disable();
-	tab.text = tab:GetText();
-	-- Gray out text
-	tab:SetDisabledFontObject(GameFontDisableSmall);
-	local leftDisabled = tab.LeftDisabled or _G[name.."LeftDisabled"];
-	local middleDisabled = tab.MiddleDisabled or _G[name.."MiddleDisabled"];
-	local rightDisabled = tab.RightDisabled or _G[name.."RightDisabled"];
-	leftDisabled:Hide();
-	middleDisabled:Hide();
-	rightDisabled:Hide();
-end
-
 local function UpdateTabLook(frame)
 	if frame.disabled then
 		PanelTemplates_SetDisabledTabState(frame)
@@ -236,64 +103,11 @@ local methods = {
 
 	["CreateTab"] = function(self, id)
 		local tabname = ("AceGUITabGroup%dTab%d"):format(self.num, id)
-		local tab = CreateFrame("Button", tabname, self.border)
+		local tab = CreateFrame("Button", tabname, self.border, "OptionsFrameTabButtonTemplate")
-		tab:SetSize(115, 24)
-		tab.deselectedTextY = -3
-		tab.selectedTextY = -2
-
-		tab.LeftDisabled = tab:CreateTexture(tabname .. "LeftDisabled", "BORDER")
-		tab.LeftDisabled:SetTexture("Interface\\OptionsFrame\\UI-OptionsFrame-ActiveTab")
-		tab.LeftDisabled:SetSize(20, 24)
-		tab.LeftDisabled:SetPoint("BOTTOMLEFT", 0, -3)
-		tab.LeftDisabled:SetTexCoord(0, 0.15625, 0, 1.0)
-
-		tab.MiddleDisabled = tab:CreateTexture(tabname .. "MiddleDisabled", "BORDER")
-		tab.MiddleDisabled:SetTexture("Interface\\OptionsFrame\\UI-OptionsFrame-ActiveTab")
-		tab.MiddleDisabled:SetSize(88, 24)
-		tab.MiddleDisabled:SetPoint("LEFT", tab.LeftDisabled, "RIGHT")
-		tab.MiddleDisabled:SetTexCoord(0.15625, 0.84375, 0, 1.0)
-
-		tab.RightDisabled = tab:CreateTexture(tabname .. "RightDisabled", "BORDER")
-		tab.RightDisabled:SetTexture("Interface\\OptionsFrame\\UI-OptionsFrame-ActiveTab")
-		tab.RightDisabled:SetSize(20, 24)
-		tab.RightDisabled:SetPoint("LEFT", tab.MiddleDisabled, "RIGHT")
-		tab.RightDisabled:SetTexCoord(0.84375, 1.0, 0, 1.0)
-
-		tab.Left = tab:CreateTexture(tabname .. "Left", "BORDER")
-		tab.Left:SetTexture("Interface\\OptionsFrame\\UI-OptionsFrame-InActiveTab")
-		tab.Left:SetSize(20, 24)
-		tab.Left:SetPoint("TOPLEFT")
-		tab.Left:SetTexCoord(0, 0.15625, 0, 1.0)
-
-		tab.Middle = tab:CreateTexture(tabname .. "Middle", "BORDER")
-		tab.Middle:SetTexture("Interface\\OptionsFrame\\UI-OptionsFrame-InActiveTab")
-		tab.Middle:SetSize(88, 24)
-		tab.Middle:SetPoint("LEFT", tab.Left, "RIGHT")
-		tab.Middle:SetTexCoord(0.15625, 0.84375, 0, 1.0)
-
-		tab.Right = tab:CreateTexture(tabname .. "Right", "BORDER")
-		tab.Right:SetTexture("Interface\\OptionsFrame\\UI-OptionsFrame-InActiveTab")
-		tab.Right:SetSize(20, 24)
-		tab.Right:SetPoint("LEFT", tab.Middle, "RIGHT")
-		tab.Right:SetTexCoord(0.84375, 1.0, 0, 1.0)
-
-		tab.Text = tab:CreateFontString(tabname .. "Text")
-		tab:SetFontString(tab.Text)
-
-		tab:SetNormalFontObject(GameFontNormalSmall)
-		tab:SetHighlightFontObject(GameFontHighlightSmall)
-		tab:SetDisabledFontObject(GameFontHighlightSmall)
-		tab:SetHighlightTexture("Interface\\PaperDollInfoFrame\\UI-Character-Tab-Highlight", "ADD")
-		tab.HighlightTexture = tab:GetHighlightTexture()
-		tab.HighlightTexture:ClearAllPoints()
-		tab.HighlightTexture:SetPoint("LEFT", tab, "LEFT", 10, -4)
-		tab.HighlightTexture:SetPoint("RIGHT", tab, "RIGHT", -10, -4)
-		_G[tabname .. "HighlightTexture"] = tab.HighlightTexture
-
 		tab.obj = self
 		tab.id = id
 
-		tab.text = tab.Text -- compat
+		tab.text = _G[tabname .. "Text"]
 		tab.text:ClearAllPoints()
 		tab.text:SetPoint("LEFT", 14, -3)
 		tab.text:SetPoint("RIGHT", -12, -3)
@@ -502,7 +316,7 @@ local function Constructor()
 	titletext:SetHeight(18)
 	titletext:SetText("")
 
-	local border = CreateFrame("Frame", nil, frame, "BackdropTemplate")
+	local border = CreateFrame("Frame", nil, frame)
 	border:SetPoint("TOPLEFT", 1, -27)
 	border:SetPoint("BOTTOMRIGHT", -1, 3)
 	border:SetBackdrop(PaneBackdrop)

Libs/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua

@@ -2,18 +2,24 @@
 TreeGroup Container
 Container that uses a tree control to switch between groups.
 -------------------------------------------------------------------------------]]
-local Type, Version = "TreeGroup", 49
+local Type, Version = "TreeGroup", 44
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
+local WoW80 = select(4, GetBuildInfo()) >= 80000
+
 -- Lua APIs
 local next, pairs, ipairs, assert, type = next, pairs, ipairs, assert, type
-local math_min, math_max, floor = math.min, math.max, math.floor
+local math_min, math_max, floor = math.min, math.max, floor
 local select, tremove, unpack, tconcat = select, table.remove, unpack, table.concat
 
 -- WoW APIs
 local CreateFrame, UIParent = CreateFrame, UIParent
 
+-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
+-- List them here for Mikk's FindGlobals script
+-- GLOBALS: FONT_COLOR_CODE_CLOSE
+
 -- Recycling functions
 local new, del
 do
@@ -206,7 +212,7 @@ local function Button_OnEnter(frame)
 		tooltip:SetOwner(frame, "ANCHOR_NONE")
 		tooltip:ClearAllPoints()
 		tooltip:SetPoint("LEFT",frame,"RIGHT")
-		tooltip:SetText(frame.text:GetText() or "", 1, .82, 0, 1, true)
+		tooltip:SetText(frame.text:GetText() or "", 1, .82, 0, true)
 
 		tooltip:Show()
 	end
@@ -387,6 +393,10 @@ local methods = {
 	["RefreshTree"] = function(self,scrollToSelection,fromOnUpdate)
 		local buttons = self.buttons
 		local lines = self.lines
+
+		for i, v in ipairs(buttons) do
+			v:Hide()
+		end
 		while lines[1] do
 			local t = tremove(lines)
 			for k in pairs(t) do
@@ -412,7 +422,8 @@ local methods = {
 		local maxlines = (floor(((self.treeframe:GetHeight()or 0) - 20 ) / 18))
 		if maxlines <= 0 then return end
 
-		if self.frame:GetParent() == UIParent and not fromOnUpdate then
+		-- workaround for lag spikes on WoW 8.0
+		if WoW80 and self.frame:GetParent() == UIParent and not fromOnUpdate then
 			self.frame:SetScript("OnUpdate", FirstFrameUpdate)
 			return
 		end
@@ -495,10 +506,6 @@ local methods = {
 			buttonnum = buttonnum + 1
 		end
 
-		-- We hide the remaining buttons after updating others to avoid a blizzard bug that keeps them interactable even if hidden when hidden before updating the buttons.
-		for i = buttonnum, #buttons do
-			buttons[i]:Hide()
-		end
 	end,
 
 	["SetSelected"] = function(self, value)
@@ -563,11 +570,7 @@ local methods = {
 		if maxtreewidth > 100 and status.treewidth > maxtreewidth then
 			self:SetTreeWidth(maxtreewidth, status.treesizable)
 		end
-		if treeframe.SetResizeBounds then
-			treeframe:SetResizeBounds(100, 1, maxtreewidth, 1600)
-		else
 		treeframe:SetMaxResize(maxtreewidth, 1600)
-		end
 	end,
 
 	["OnHeightSet"] = function(self, height)
@@ -629,7 +632,7 @@ local PaneBackdrop  = {
 local DraggerBackdrop  = {
 	bgFile = "Interface\\Tooltips\\UI-Tooltip-Background",
 	edgeFile = nil,
-	tile = true, tileSize = 16, edgeSize = 1,
+	tile = true, tileSize = 16, edgeSize = 0,
 	insets = { left = 3, right = 3, top = 7, bottom = 7 }
 }
 
@@ -637,7 +640,7 @@ local function Constructor()
 	local num = AceGUI:GetNextWidgetNum(Type)
 	local frame = CreateFrame("Frame", nil, UIParent)
 
-	local treeframe = CreateFrame("Frame", nil, frame, "BackdropTemplate")
+	local treeframe = CreateFrame("Frame", nil, frame)
 	treeframe:SetPoint("TOPLEFT")
 	treeframe:SetPoint("BOTTOMLEFT")
 	treeframe:SetWidth(DEFAULT_TREE_WIDTH)
@@ -646,17 +649,13 @@ local function Constructor()
 	treeframe:SetBackdropColor(0.1, 0.1, 0.1, 0.5)
 	treeframe:SetBackdropBorderColor(0.4, 0.4, 0.4)
 	treeframe:SetResizable(true)
-	if treeframe.SetResizeBounds then -- WoW 10.0
-		treeframe:SetResizeBounds(100, 1, 400, 1600)
-	else
 	treeframe:SetMinResize(100, 1)
 	treeframe:SetMaxResize(400, 1600)
-	end
 	treeframe:SetScript("OnUpdate", FirstFrameUpdate)
 	treeframe:SetScript("OnSizeChanged", Tree_OnSizeChanged)
 	treeframe:SetScript("OnMouseWheel", Tree_OnMouseWheel)
 
-	local dragger = CreateFrame("Frame", nil, treeframe, "BackdropTemplate")
+	local dragger = CreateFrame("Frame", nil, treeframe)
 	dragger:SetWidth(8)
 	dragger:SetPoint("TOP", treeframe, "TOPRIGHT")
 	dragger:SetPoint("BOTTOM", treeframe, "BOTTOMRIGHT")
@@ -681,7 +680,7 @@ local function Constructor()
 	scrollbg:SetAllPoints(scrollbar)
 	scrollbg:SetColorTexture(0,0,0,0.4)
 
-	local border = CreateFrame("Frame", nil, frame, "BackdropTemplate")
+	local border = CreateFrame("Frame",nil,frame)
 	border:SetPoint("TOPLEFT", treeframe, "TOPRIGHT")
 	border:SetPoint("BOTTOMRIGHT")
 	border:SetBackdrop(PaneBackdrop)

Libs/AceGUI-3.0/widgets/AceGUIContainer-Window.lua

@@ -7,6 +7,10 @@ local pairs, assert, type = pairs, assert, type
 local PlaySound = PlaySound
 local CreateFrame, UIParent = CreateFrame, UIParent
 
+-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
+-- List them here for Mikk's FindGlobals script
+-- GLOBALS: GameFontNormal
+
 ----------------
 -- Main Frame --
 ----------------
@@ -17,7 +21,7 @@ local CreateFrame, UIParent = CreateFrame, UIParent
 ]]
 do
 	local Type = "Window"
-	local Version = 8
+	local Version = 6
 
 	local function frameOnShow(this)
 		this.obj:Fire("OnShow")
@@ -182,11 +186,7 @@ do
 
 		frame:SetScript("OnShow",frameOnShow)
 		frame:SetScript("OnHide",frameOnClose)
-		if frame.SetResizeBounds then -- WoW 10.0
-			frame:SetResizeBounds(240,240)
-		else
 		frame:SetMinResize(240,240)
-		end
 		frame:SetToplevel(true)
 
 		local titlebg = frame:CreateTexture(nil, "BACKGROUND")
@@ -300,7 +300,7 @@ do
 		line2:SetHeight(8)
 		line2:SetPoint("BOTTOMRIGHT", -8, 8)
 		line2:SetTexture(137057) -- Interface\\Tooltips\\UI-Tooltip-Border
-		x = 0.1 * 8/17
+		local x = 0.1 * 8/17
 		line2:SetTexCoord(0.05 - x, 0.5, 0.05, 0.5 + x, 0.05, 0.5 - x, 0.5 + x, 0.5)
 
 		local sizer_s = CreateFrame("Frame",nil,frame)

Libs/AceGUI-3.0/widgets/AceGUIWidget-CheckBox.lua

@@ -1,7 +1,7 @@
 --[[-----------------------------------------------------------------------------
 Checkbox Widget
 -------------------------------------------------------------------------------]]
-local Type, Version = "CheckBox", 27
+local Type, Version = "CheckBox", 26
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -12,6 +12,10 @@ local select, pairs = select, pairs
 local PlaySound = PlaySound
 local CreateFrame, UIParent = CreateFrame, UIParent
 
+-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
+-- List them here for Mikk's FindGlobals script
+-- GLOBALS: SetDesaturation, GameFontHighlight
+
 --[[-----------------------------------------------------------------------------
 Support functions
 -------------------------------------------------------------------------------]]
@@ -97,7 +101,7 @@ local methods = {
 		if disabled then
 			self.frame:Disable()
 			self.text:SetTextColor(0.5, 0.5, 0.5)
-			self.check:SetDesaturated(true)
+			SetDesaturation(self.check, true)
 			if self.desc then
 				self.desc:SetTextColor(0.5, 0.5, 0.5)
 			end
@@ -105,9 +109,9 @@ local methods = {
 			self.frame:Enable()
 			self.text:SetTextColor(1, 1, 1)
 			if self.tristate and self.checked == nil then
-				self.check:SetDesaturated(true)
+				SetDesaturation(self.check, true)
 			else
-				self.check:SetDesaturated(false)
+				SetDesaturation(self.check, false)
 			end
 			if self.desc then
 				self.desc:SetTextColor(1, 1, 1)
@@ -119,15 +123,15 @@ local methods = {
 		local check = self.check
 		self.checked = value
 		if value then
-			self.check:SetDesaturated(false)
+			SetDesaturation(check, false)
 			check:Show()
 		else
 			--Nil is the unknown tristate value
 			if self.tristate and value == nil then
-				self.check:SetDesaturated(true)
+				SetDesaturation(check, true)
 				check:Show()
 			else
-				self.check:SetDesaturated(false)
+				SetDesaturation(check, false)
 				check:Hide()
 			end
 		end
@@ -195,14 +199,14 @@ local methods = {
 	["SetDescription"] = function(self, desc)
 		if desc then
 			if not self.desc then
-				local f = self.frame:CreateFontString(nil, "OVERLAY", "GameFontHighlightSmall")
+				local desc = self.frame:CreateFontString(nil, "OVERLAY", "GameFontHighlightSmall")
-				f:ClearAllPoints()
+				desc:ClearAllPoints()
-				f:SetPoint("TOPLEFT", self.checkbg, "TOPRIGHT", 5, -21)
+				desc:SetPoint("TOPLEFT", self.checkbg, "TOPRIGHT", 5, -21)
-				f:SetWidth(self.frame.width - 30)
+				desc:SetWidth(self.frame.width - 30)
-				f:SetPoint("RIGHT", self.frame, "RIGHT", -30, 0)
+				desc:SetPoint("RIGHT", self.frame, "RIGHT", -30, 0)
-				f:SetJustifyH("LEFT")
+				desc:SetJustifyH("LEFT")
-				f:SetJustifyV("TOP")
+				desc:SetJustifyV("TOP")
-				self.desc = f
+				self.desc = desc
 			end
 			self.desc:Show()
 			--self.text:SetFontObject(GameFontNormal)

Libs/AceGUI-3.0/widgets/AceGUIWidget-ColorPicker.lua

@@ -1,7 +1,7 @@
 --[[-----------------------------------------------------------------------------
 ColorPicker Widget
 -------------------------------------------------------------------------------]]
-local Type, Version = "ColorPicker", 29
+local Type, Version = "ColorPicker", 25
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -11,24 +11,17 @@ local pairs = pairs
 -- WoW APIs
 local CreateFrame, UIParent = CreateFrame, UIParent
 
--- Unfortunately we have no way to realistically detect if a client uses inverted alpha
+-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- as no API will tell you. Wrath uses the old colorpicker, era uses the new one, both are inverted
+-- List them here for Mikk's FindGlobals script
-local INVERTED_ALPHA = (WOW_PROJECT_ID ~= WOW_PROJECT_MAINLINE and WOW_PROJECT_ID ~= WOW_PROJECT_CAMELOT)
+-- GLOBALS: ColorPickerFrame, OpacitySliderFrame
 
 --[[-----------------------------------------------------------------------------
 Support functions
 -------------------------------------------------------------------------------]]
 local function ColorCallback(self, r, g, b, a, isAlpha)
-	if INVERTED_ALPHA and a then
-		a = 1 - a
-	end
 	if not self.HasAlpha then
 		a = 1
 	end
-	-- no change, skip update
-	if r == self.r and g == self.g and b == self.b and a == self.a then
-		return
-	end
 	self:SetColor(r, g, b, a)
 	if ColorPickerFrame:IsVisible() then
 		--colorpicker is still open
@@ -61,54 +54,22 @@ local function ColorSwatch_OnClick(frame)
 		ColorPickerFrame:SetFrameLevel(frame:GetFrameLevel() + 10)
 		ColorPickerFrame:SetClampedToScreen(true)
 
-		if ColorPickerFrame.SetupColorPickerAndShow then -- 10.2.5 color picker overhaul
-			local r2, g2, b2, a2 = self.r, self.g, self.b, (self.a or 1)
-			if INVERTED_ALPHA then
-				a2 = 1 - a2
-			end
-
-			local info = {
-				swatchFunc = function()
-					local r, g, b = ColorPickerFrame:GetColorRGB()
-					local a = ColorPickerFrame:GetColorAlpha()
-					ColorCallback(self, r, g, b, a)
-				end,
-
-				hasOpacity = self.HasAlpha,
-				opacityFunc = function()
-					local r, g, b = ColorPickerFrame:GetColorRGB()
-					local a = ColorPickerFrame:GetColorAlpha()
-					ColorCallback(self, r, g, b, a, true)
-				end,
-				opacity = a2,
-
-				cancelFunc = function()
-					ColorCallback(self, r2, g2, b2, a2, true)
-				end,
-
-				r = r2,
-				g = g2,
-				b = b2,
-			}
-
-			ColorPickerFrame:SetupColorPickerAndShow(info)
-		else
 		ColorPickerFrame.func = function()
 			local r, g, b = ColorPickerFrame:GetColorRGB()
-				local a = OpacitySliderFrame:GetValue()
+			local a = 1 - OpacitySliderFrame:GetValue()
 			ColorCallback(self, r, g, b, a)
 		end
 
 		ColorPickerFrame.hasOpacity = self.HasAlpha
 		ColorPickerFrame.opacityFunc = function()
 			local r, g, b = ColorPickerFrame:GetColorRGB()
-				local a = OpacitySliderFrame:GetValue()
+			local a = 1 - OpacitySliderFrame:GetValue()
 			ColorCallback(self, r, g, b, a, true)
 		end
 
-			local r, g, b, a = self.r, self.g, self.b, 1 - (self.a or 1)
+		local r, g, b, a = self.r, self.g, self.b, self.a
 		if self.HasAlpha then
-				ColorPickerFrame.opacity = a
+			ColorPickerFrame.opacity = 1 - (a or 0)
 		end
 		ColorPickerFrame:SetColorRGB(r, g, b)
 
@@ -118,7 +79,6 @@ local function ColorSwatch_OnClick(frame)
 
 		ColorPickerFrame:Show()
 	end
-	end
 	AceGUI:ClearFocus()
 end
 

Libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown-Items.lua

@@ -1,4 +1,4 @@
---[[ $Id$ ]]--
+--[[ $Id: AceGUIWidget-DropDown-Items.lua 1202 2019-05-15 23:11:22Z nevcairiel $ ]]--
 
 local AceGUI = LibStub("AceGUI-3.0")
 
@@ -41,7 +41,7 @@ local ItemBase = {
 	-- NOTE: The ItemBase version is added to each item's version number
 	--       to ensure proper updates on ItemBase changes.
 	--       Use at least 1000er steps.
-	version = 2000,
+	version = 1000,
 	counter = 0,
 }
 
@@ -178,7 +178,7 @@ function ItemBase.Create(type)
 	highlight:Hide()
 	self.highlight = highlight
 
-	local check = frame:CreateTexture(nil, "OVERLAY")
+	local check = frame:CreateTexture("OVERLAY")
 	check:SetWidth(16)
 	check:SetHeight(16)
 	check:SetPoint("LEFT",frame,"LEFT",3,-1)
@@ -186,7 +186,7 @@ function ItemBase.Create(type)
 	check:Hide()
 	self.check = check
 
-	local sub = frame:CreateTexture(nil, "OVERLAY")
+	local sub = frame:CreateTexture("OVERLAY")
 	sub:SetWidth(16)
 	sub:SetHeight(16)
 	sub:SetPoint("RIGHT",frame,"RIGHT",-3,-1)

Libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua

@@ -1,4 +1,4 @@
---[[ $Id$ ]]--
+--[[ $Id: AceGUIWidget-DropDown.lua 1209 2019-06-24 21:01:01Z nevcairiel $ ]]--
 local AceGUI = LibStub("AceGUI-3.0")
 
 -- Lua APIs
@@ -11,6 +11,10 @@ local PlaySound = PlaySound
 local UIParent, CreateFrame = UIParent, CreateFrame
 local _G = _G
 
+-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
+-- List them here for Mikk's FindGlobals script
+-- GLOBALS: CLOSE
+
 local function fixlevels(parent,...)
 	local i = 1
 	local child = select(i, ...)
@@ -35,7 +39,7 @@ end
 
 do
 	local widgetType = "Dropdown-Pullout"
-	local widgetVersion = 5
+	local widgetVersion = 3
 
 	--[[ Static data ]]--
 
@@ -189,7 +193,12 @@ do
 
 		local height = 8
 		for i, item in pairs(items) do
-			item:SetPoint("TOP", itemFrame, "TOP", 0, -2 + (i - 1) * -16)
+			if i == 1 then
+				item:SetPoint("TOP", itemFrame, "TOP", 0, -2)
+			else
+				item:SetPoint("TOP", items[i-1].frame, "BOTTOM", 0, 1)
+			end
+
 			item:Show()
 
 			height = height + 16
@@ -249,7 +258,7 @@ do
 
 	local function Constructor()
 		local count = AceGUI:GetNextWidgetNum(widgetType)
-		local frame = CreateFrame("Frame", "AceGUI30Pullout"..count, UIParent, "BackdropTemplate")
+		local frame = CreateFrame("Frame", "AceGUI30Pullout"..count, UIParent)
 		local self = {}
 		self.count = count
 		self.type = widgetType
@@ -300,7 +309,7 @@ do
 		scrollFrame.obj = self
 		itemFrame.obj = self
 
-		local slider = CreateFrame("Slider", "AceGUI30PulloutScrollbar"..count, scrollFrame, "BackdropTemplate")
+		local slider = CreateFrame("Slider", "AceGUI30PulloutScrollbar"..count, scrollFrame)
 		slider:SetOrientation("VERTICAL")
 		slider:SetHitRectInsets(0, 0, -10, 0)
 		slider:SetBackdrop(sliderBackdrop)
@@ -347,7 +356,7 @@ end
 
 do
 	local widgetType = "Dropdown"
-	local widgetVersion = 36
+	local widgetVersion = 34
 
 	--[[ Static data ]]--
 
@@ -372,6 +381,7 @@ do
 
 	local function Dropdown_TogglePullout(this)
 		local self = this.obj
+		PlaySound(856) -- SOUNDKIT.IG_MAINMENU_OPTION_CHECKBOX_ON
 		if self.open then
 			self.open = nil
 			self.pullout:Close()
@@ -455,7 +465,6 @@ do
 		self:SetWidth(200)
 		self:SetLabel()
 		self:SetPulloutWidth(nil)
-		self.list = {}
 	end
 
 	-- exported, AceGUI callback
@@ -526,7 +535,9 @@ do
 
 	-- exported
 	local function SetValue(self, value)
+		if self.list then
 			self:SetText(self.list[value] or "")
+		end
 		self.value = value
 	end
 
@@ -590,7 +601,7 @@ do
 		end
 	end
 	local function SetList(self, list, order, itemType)
-		self.list = list or {}
+		self.list = list
 		self.pullout:Clear()
 		self.hasClose = nil
 		if not list then return end
@@ -618,9 +629,11 @@ do
 
 	-- exported
 	local function AddItem(self, value, text, itemType)
+		if self.list then
 			self.list[value] = text
 			AddListItem(self, value, text, itemType)
 		end
+	end
 
 	-- exported
 	local function SetMultiselect(self, multi)

Libs/AceGUI-3.0/widgets/AceGUIWidget-EditBox.lua

@@ -1,7 +1,7 @@
 --[[-----------------------------------------------------------------------------
 EditBox Widget
 -------------------------------------------------------------------------------]]
-local Type, Version = "EditBox", 29
+local Type, Version = "EditBox", 28
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -10,21 +10,21 @@ local tostring, pairs = tostring, pairs
 
 -- WoW APIs
 local PlaySound = PlaySound
-local GetCursorInfo, ClearCursor = GetCursorInfo, ClearCursor
+local GetCursorInfo, ClearCursor, GetSpellInfo = GetCursorInfo, ClearCursor, GetSpellInfo
 local CreateFrame, UIParent = CreateFrame, UIParent
 local _G = _G
 
+-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
+-- List them here for Mikk's FindGlobals script
+-- GLOBALS: AceGUIEditBoxInsertLink, ChatFontNormal, OKAY
+
 --[[-----------------------------------------------------------------------------
 Support functions
 -------------------------------------------------------------------------------]]
 if not AceGUIEditBoxInsertLink then
 	-- upgradeable hook
-	if ChatFrameUtil and ChatFrameUtil.InsertLink then
-		hooksecurefunc(ChatFrameUtil, "InsertLink", function(...) return _G.AceGUIEditBoxInsertLink(...) end)
-	elseif ChatEdit_InsertLink then
 	hooksecurefunc("ChatEdit_InsertLink", function(...) return _G.AceGUIEditBoxInsertLink(...) end)
 end
-end
 
 function _G.AceGUIEditBoxInsertLink(text)
 	for i = 1, AceGUI:GetWidgetCount(Type) do
@@ -80,16 +80,12 @@ end
 
 local function EditBox_OnReceiveDrag(frame)
 	local self = frame.obj
-	local type, id, info, extra = GetCursorInfo()
+	local type, id, info = GetCursorInfo()
 	local name
 	if type == "item" then
 		name = info
 	elseif type == "spell" then
-		if C_Spell and C_Spell.GetSpellName then
-			name = C_Spell.GetSpellName(extra)
-		else
 		name = GetSpellInfo(id, info)
-		end
 	elseif type == "macro" then
 		name = GetMacroInfo(id)
 	end

Libs/AceGUI-3.0/widgets/AceGUIWidget-Heading.lua

@@ -1,7 +1,7 @@
 --[[-----------------------------------------------------------------------------
 Heading Widget
 -------------------------------------------------------------------------------]]
-local Type, Version = "Heading", 21
+local Type, Version = "Heading", 20
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -9,7 +9,7 @@ if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 local pairs = pairs
 
 -- WoW APIs
-local CreateFrame, UIParent, issecretvalue = CreateFrame, UIParent, issecretvalue
+local CreateFrame, UIParent = CreateFrame, UIParent
 
 --[[-----------------------------------------------------------------------------
 Methods
@@ -21,16 +21,11 @@ local methods = {
 		self:SetHeight(18)
 	end,
 
-	["OnRelease"] = function(self)
+	-- ["OnRelease"] = nil,
-		self.label:ClearText()
-		self.label:ClearAllPoints()
-		self.label:SetPoint("TOP")
-		self.label:SetPoint("BOTTOM")
-	end,
 
 	["SetText"] = function(self, text)
 		self.label:SetText(text or "")
-		if issecretvalue(text) or (text and text ~= "") then
+		if text and text ~= "" then
 			self.left:SetPoint("RIGHT", self.label, "LEFT", -5, 0)
 			self.right:Show()
 		else

Libs/AceGUI-3.0/widgets/AceGUIWidget-Icon.lua

@@ -1,7 +1,7 @@
 --[[-----------------------------------------------------------------------------
 Icon Widget
 -------------------------------------------------------------------------------]]
-local Type, Version = "Icon", 22
+local Type, Version = "Icon", 21
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -67,11 +67,6 @@ local methods = {
 		end
 	end,
 
-	["SetImageByAtlas"] = function(self, atlasString)
-		local image = self.image
-		image:SetAtlas(atlasString)
-	end,
-
 	["SetImageSize"] = function(self, width, height)
 		self.image:SetWidth(width)
 		self.image:SetHeight(height)

Libs/AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua

@@ -2,7 +2,7 @@
 Keybinding Widget
 Set Keybindings in the Config UI.
 -------------------------------------------------------------------------------]]
-local Type, Version = "Keybinding", 27
+local Type, Version = "Keybinding", 25
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -13,6 +13,10 @@ local pairs = pairs
 local IsShiftKeyDown, IsControlKeyDown, IsAltKeyDown = IsShiftKeyDown, IsControlKeyDown, IsAltKeyDown
 local CreateFrame, UIParent = CreateFrame, UIParent
 
+-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
+-- List them here for Mikk's FindGlobals script
+-- GLOBALS: NOT_BOUND
+
 --[[-----------------------------------------------------------------------------
 Scripts
 -------------------------------------------------------------------------------]]
@@ -31,14 +35,12 @@ local function Keybinding_OnClick(frame, button)
 		if self.waitingForKey then
 			frame:EnableKeyboard(false)
 			frame:EnableMouseWheel(false)
-			frame:EnableGamePadButton(false)
 			self.msgframe:Hide()
 			frame:UnlockHighlight()
 			self.waitingForKey = nil
 		else
 			frame:EnableKeyboard(true)
 			frame:EnableMouseWheel(true)
-			frame:EnableGamePadButton(true)
 			self.msgframe:Show()
 			frame:LockHighlight()
 			self.waitingForKey = true
@@ -74,7 +76,6 @@ local function Keybinding_OnKeyDown(frame, key)
 
 		frame:EnableKeyboard(false)
 		frame:EnableMouseWheel(false)
-		frame:EnableGamePadButton(false)
 		self.msgframe:Hide()
 		frame:UnlockHighlight()
 		self.waitingForKey = nil
@@ -122,7 +123,6 @@ local methods = {
 		self:SetDisabled(false)
 		self.button:EnableKeyboard(false)
 		self.button:EnableMouseWheel(false)
-		self.button:EnableGamePadButton(false)
 	end,
 
 	-- ["OnRelease"] = nil,
@@ -199,12 +199,10 @@ local function Constructor()
 	button:SetScript("OnKeyDown", Keybinding_OnKeyDown)
 	button:SetScript("OnMouseDown", Keybinding_OnMouseDown)
 	button:SetScript("OnMouseWheel", Keybinding_OnMouseWheel)
-	button:SetScript("OnGamePadButtonDown", Keybinding_OnKeyDown)
 	button:SetPoint("BOTTOMLEFT")
 	button:SetPoint("BOTTOMRIGHT")
 	button:SetHeight(24)
 	button:EnableKeyboard(false)
-	button:EnableGamePadButton(false)
 
 	local text = button:GetFontString()
 	text:SetPoint("LEFT", 7, 0)
@@ -216,7 +214,7 @@ local function Constructor()
 	label:SetJustifyH("CENTER")
 	label:SetHeight(18)
 
-	local msgframe = CreateFrame("Frame", nil, UIParent, "BackdropTemplate")
+	local msgframe = CreateFrame("Frame", nil, UIParent)
 	msgframe:SetHeight(30)
 	msgframe:SetBackdrop(ControlBackdrop)
 	msgframe:SetBackdropColor(0,0,0)

Libs/AceGUI-3.0/widgets/AceGUIWidget-Label.lua

@@ -2,7 +2,7 @@
 Label Widget
 Displays text and optionally an icon.
 -------------------------------------------------------------------------------]]
-local Type, Version = "Label", 29
+local Type, Version = "Label", 26
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -12,6 +12,10 @@ local max, select, pairs = math.max, select, pairs
 -- WoW APIs
 local CreateFrame, UIParent = CreateFrame, UIParent
 
+-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
+-- List them here for Mikk's FindGlobals script
+-- GLOBALS: GameFontHighlightSmall
+
 --[[-----------------------------------------------------------------------------
 Support functions
 -------------------------------------------------------------------------------]]
@@ -124,24 +128,12 @@ local methods = {
 		UpdateImageAnchor(self)
 	end,
 
-	["SetImageByAtlas"] = function(self, atlasString)
-		self.imageshown = true
-		local image = self.image
-		image:SetAtlas(atlasString)
-		UpdateImageAnchor(self)
-	end,
-
 	["SetFont"] = function(self, font, height, flags)
-		if not self.fontObject then
+		self.label:SetFont(font, height, flags)
-			self.fontObject = CreateFont("AceGUI30LabelFont" .. AceGUI:GetNextWidgetNum(Type))
-		end
-		self.fontObject:SetFont(font, height, flags)
-		self:SetFontObject(self.fontObject)
 	end,
 
 	["SetFontObject"] = function(self, font)
-		self.label:SetFontObject(font or GameFontHighlightSmall)
+		self:SetFont((font or GameFontHighlightSmall):GetFont())
-		UpdateImageAnchor(self)
 	end,
 
 	["SetImageSize"] = function(self, width, height)

Libs/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua

@@ -1,4 +1,4 @@
-local Type, Version = "MultiLineEditBox", 33
+local Type, Version = "MultiLineEditBox", 28
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -6,22 +6,22 @@ if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 local pairs = pairs
 
 -- WoW APIs
-local GetCursorInfo, ClearCursor = GetCursorInfo, ClearCursor
+local GetCursorInfo, GetSpellInfo, ClearCursor = GetCursorInfo, GetSpellInfo, ClearCursor
 local CreateFrame, UIParent = CreateFrame, UIParent
 local _G = _G
 
+-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
+-- List them here for Mikk's FindGlobals script
+-- GLOBALS: ACCEPT, ChatFontNormal
+
 --[[-----------------------------------------------------------------------------
 Support functions
 -------------------------------------------------------------------------------]]
 
 if not AceGUIMultiLineEditBoxInsertLink then
 	-- upgradeable hook
-	if ChatFrameUtil and ChatFrameUtil.InsertLink then
-		hooksecurefunc(ChatFrameUtil, "InsertLink", function(...) return _G.AceGUIMultiLineEditBoxInsertLink(...) end)
-	elseif ChatEdit_InsertLink then
 	hooksecurefunc("ChatEdit_InsertLink", function(...) return _G.AceGUIMultiLineEditBoxInsertLink(...) end)
 end
-end
 
 function _G.AceGUIMultiLineEditBoxInsertLink(text)
 	for i = 1, AceGUI:GetWidgetCount(Type) do
@@ -104,13 +104,9 @@ local function OnMouseUp(self)
 end
 
 local function OnReceiveDrag(self)                                               -- EditBox / ScrollFrame
-	local type, id, info, extra = GetCursorInfo()
+	local type, id, info = GetCursorInfo()
 	if type == "spell" then
-		if C_Spell and C_Spell.GetSpellName then
-			info = C_Spell.GetSpellName(extra)
-		else
 		info = GetSpellInfo(id, info)
-		end
 	elseif type ~= "item" then
 		return
 	end
@@ -149,14 +145,6 @@ local function OnVerticalScroll(self, offset)
 	editBox:SetHitRectInsets(0, 0, offset, editBox:GetHeight() - offset - self:GetHeight())
 end
 
-local function OnScrollRangeChanged(self, xrange, yrange)
-	if yrange == 0 then
-		self.obj.editBox:SetHitRectInsets(0, 0, 0, 0)
-	else
-		OnVerticalScroll(self, self:GetVerticalScroll())
-	end
-end
-
 local function OnShowFocus(frame)
 	frame.obj.editBox:SetFocus()
 	frame:SetScript("OnShow", nil)
@@ -269,6 +257,8 @@ local methods = {
 	["SetCursorPosition"] = function(self, ...)
 		return self.editBox:SetCursorPosition(...)
 	end,
+
+
 }
 
 --[[-----------------------------------------------------------------------------
@@ -307,7 +297,7 @@ local function Constructor()
 	text:SetPoint("BOTTOMRIGHT", button, "BOTTOMRIGHT", -5, 1)
 	text:SetJustifyV("MIDDLE")
 
-	local scrollBG = CreateFrame("Frame", nil, frame, "BackdropTemplate")
+	local scrollBG = CreateFrame("Frame", nil, frame)
 	scrollBG:SetBackdrop(backdrop)
 	scrollBG:SetBackdropColor(0, 0, 0)
 	scrollBG:SetBackdropBorderColor(0.4, 0.4, 0.4)
@@ -331,7 +321,6 @@ local function Constructor()
 	scrollFrame:SetScript("OnReceiveDrag", OnReceiveDrag)
 	scrollFrame:SetScript("OnSizeChanged", OnSizeChanged)
 	scrollFrame:HookScript("OnVerticalScroll", OnVerticalScroll)
-	scrollFrame:HookScript("OnScrollRangeChanged", OnScrollRangeChanged)
 
 	local editBox = CreateFrame("EditBox", ("%s%dEdit"):format(Type, widgetNum), scrollFrame)
 	editBox:SetAllPoints()

Libs/AceGUI-3.0/widgets/AceGUIWidget-Slider.lua

@@ -2,7 +2,7 @@
 Slider Widget
 Graphical Slider, like, for Range values.
 -------------------------------------------------------------------------------]]
-local Type, Version = "Slider", 24
+local Type, Version = "Slider", 22
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -14,6 +14,10 @@ local tonumber, pairs = tonumber, pairs
 local PlaySound = PlaySound
 local CreateFrame, UIParent = CreateFrame, UIParent
 
+-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
+-- List them here for Mikk's FindGlobals script
+-- GLOBALS: GameFontHighlightSmall
+
 --[[-----------------------------------------------------------------------------
 Support functions
 -------------------------------------------------------------------------------]]
@@ -27,13 +31,13 @@ local function UpdateText(self)
 end
 
 local function UpdateLabels(self)
-	local min_value, max_value = (self.min or 0), (self.max or 100)
+	local min, max = (self.min or 0), (self.max or 100)
 	if self.ispercent then
-		self.lowtext:SetFormattedText("%s%%", (min_value * 100))
+		self.lowtext:SetFormattedText("%s%%", (min * 100))
-		self.hightext:SetFormattedText("%s%%", (max_value * 100))
+		self.hightext:SetFormattedText("%s%%", (max * 100))
 	else
-		self.lowtext:SetText(min_value)
+		self.lowtext:SetText(min)
-		self.hightext:SetText(max_value)
+		self.hightext:SetText(max)
 	end
 end
 
@@ -171,13 +175,13 @@ local methods = {
 		self.label:SetText(text)
 	end,
 
-	["SetSliderValues"] = function(self, min_value, max_value, step)
+	["SetSliderValues"] = function(self, min, max, step)
 		local frame = self.slider
 		frame.setup = true
-		self.min = min_value
+		self.min = min
-		self.max = max_value
+		self.max = max
 		self.step = step
-		frame:SetMinMaxValues(min_value or 0,max_value or 100)
+		frame:SetMinMaxValues(min or 0,max or 100)
 		UpdateLabels(self)
 		frame:SetValueStep(step or 1)
 		if self.value then
@@ -221,7 +225,7 @@ local function Constructor()
 	label:SetJustifyH("CENTER")
 	label:SetHeight(15)
 
-	local slider = CreateFrame("Slider", nil, frame, "BackdropTemplate")
+	local slider = CreateFrame("Slider", nil, frame)
 	slider:SetOrientation("HORIZONTAL")
 	slider:SetHeight(15)
 	slider:SetHitRectInsets(0, 0, -10, 0)
@@ -243,7 +247,7 @@ local function Constructor()
 	local hightext = slider:CreateFontString(nil, "ARTWORK", "GameFontHighlightSmall")
 	hightext:SetPoint("TOPRIGHT", slider, "BOTTOMRIGHT", -2, 3)
 
-	local editbox = CreateFrame("EditBox", nil, frame, "BackdropTemplate")
+	local editbox = CreateFrame("EditBox", nil, frame)
 	editbox:SetAutoFocus(false)
 	editbox:SetFontObject(GameFontHighlightSmall)
 	editbox:SetPoint("TOP", slider, "BOTTOM")
@@ -273,7 +277,6 @@ local function Constructor()
 		widget[method] = func
 	end
 	slider.obj, editbox.obj = widget, widget
-	C_Timer.After(0.3, function() editbox:SetText(" ") UpdateText(widget) end) -- Workaround for font loading issue, making the editboxes blank until the text is changed
 
 	return AceGUI:RegisterAsWidget(widget)
 end

Libs/AceHook-3.0/AceHook-3.0.lua

@@ -9,8 +9,8 @@
 -- make into AceHook.
 -- @class file
 -- @name AceHook-3.0
--- @release $Id$
+-- @release $Id: AceHook-3.0.lua 1202 2019-05-15 23:11:22Z nevcairiel $
-local ACEHOOK_MAJOR, ACEHOOK_MINOR = "AceHook-3.0", 9
+local ACEHOOK_MAJOR, ACEHOOK_MINOR = "AceHook-3.0", 8
 local AceHook, oldminor = LibStub:NewLibrary(ACEHOOK_MAJOR, ACEHOOK_MINOR)
 
 if not AceHook then return end -- No upgrade needed
@@ -195,6 +195,7 @@ function hook(self, obj, method, handler, script, secure, raw, forceSecure, usag
 			registry[self][method] = nil
 		end
 		handlers[uid], actives[uid], scripts[uid] = nil, nil, nil
+		uid = nil
 	end
 
 	local orig
@@ -477,10 +478,10 @@ function AceHook:UnhookAll()
 	for key, value in pairs(registry[self]) do
 		if type(key) == "table" then
 			for method in pairs(value) do
-				AceHook.Unhook(self, key, method)
+				self:Unhook(key, method)
 			end
 		else
-			AceHook.Unhook(self, key)
+			self:Unhook(key)
 		end
 	end
 end

Libs/AceLocale-3.0/AceLocale-3.0.lua

@@ -1,7 +1,7 @@
 --- **AceLocale-3.0** manages localization in addons, allowing for multiple locale to be registered with fallback to the base locale for untranslated strings.
 -- @class file
 -- @name AceLocale-3.0
--- @release $Id$
+-- @release $Id: AceLocale-3.0.lua 1035 2011-07-09 03:20:13Z kaelten $
 local MAJOR,MINOR = "AceLocale-3.0", 6
 
 local AceLocale, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
@@ -12,6 +12,10 @@ if not AceLocale then return end -- no upgrade needed
 local assert, tostring, error = assert, tostring, error
 local getmetatable, setmetatable, rawset, rawget = getmetatable, setmetatable, rawset, rawget
 
+-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
+-- List them here for Mikk's FindGlobals script
+-- GLOBALS: GAME_LOCALE, geterrorhandler
+
 local gameLocale = GetLocale()
 if gameLocale == "enGB" then
 	gameLocale = "enUS"
@@ -89,7 +93,7 @@ local writedefaultproxy = setmetatable({}, {
 function AceLocale:NewLocale(application, locale, isDefault, silent)
 
 	-- GAME_LOCALE allows translators to test translations of addons without having that wow client installed
-	local activeGameLocale = GAME_LOCALE or gameLocale
+	local gameLocale = GAME_LOCALE or gameLocale
 
 	local app = AceLocale.apps[application]
 
@@ -107,7 +111,7 @@ function AceLocale:NewLocale(application, locale, isDefault, silent)
 		AceLocale.appnames[app] = application
 	end
 
-	if locale ~= activeGameLocale and not isDefault then
+	if locale ~= gameLocale and not isDefault then
 		return -- nop, we don't need these translations
 	end
 

Libs/CallbackHandler-1.0/CallbackHandler-1.0.lua

@@ -1,5 +1,5 @@
---[[ $Id: CallbackHandler-1.0.lua 25 2022-12-12 15:02:36Z nevcairiel $ ]]
+--[[ $Id: CallbackHandler-1.0.lua 22 2018-07-21 14:17:22Z nevcairiel $ ]]
-local MAJOR, MINOR = "CallbackHandler-1.0", 8
+local MAJOR, MINOR = "CallbackHandler-1.0", 7
 local CallbackHandler = LibStub:NewLibrary(MAJOR, MINOR)
 
 if not CallbackHandler then return end -- No upgrade needed
@@ -7,16 +7,26 @@ if not CallbackHandler then return end -- No upgrade needed
 local meta = {__index = function(tbl, key) tbl[key] = {} return tbl[key] end}
 
 -- Lua APIs
-local securecallfunction, error = securecallfunction, error
+local tconcat = table.concat
-local setmetatable, rawget = setmetatable, rawget
+local assert, error, loadstring = assert, error, loadstring
+local setmetatable, rawset, rawget = setmetatable, rawset, rawget
 local next, select, pairs, type, tostring = next, select, pairs, type, tostring
 
+-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
+-- List them here for Mikk's FindGlobals script
+-- GLOBALS: geterrorhandler
+
+local xpcall = xpcall
+
+local function errorhandler(err)
+	return geterrorhandler()(err)
+end
 
 local function Dispatch(handlers, ...)
 	local index, method = next(handlers)
 	if not method then return end
 	repeat
-		securecallfunction(method, ...)
+		xpcall(method, errorhandler, ...)
 		index, method = next(handlers, index)
 	until not method
 end
@@ -29,7 +39,7 @@ end
 --   UnregisterName    - name of the callback unregistration API, default "UnregisterCallback"
 --   UnregisterAllName - name of the API to unregister all callbacks, default "UnregisterAllCallbacks". false == don't publish this API.
 
-function CallbackHandler.New(_self, target, RegisterName, UnregisterName, UnregisterAllName)
+function CallbackHandler:New(target, RegisterName, UnregisterName, UnregisterAllName)
 
 	RegisterName = RegisterName or "RegisterCallback"
 	UnregisterName = UnregisterName or "UnregisterCallback"
@@ -57,13 +67,13 @@ function CallbackHandler.New(_self, target, RegisterName, UnregisterName, Unregi
 
 		if registry.insertQueue and oldrecurse==0 then
 			-- Something in one of our callbacks wanted to register more callbacks; they got queued
-			for event,callbacks in pairs(registry.insertQueue) do
+			for eventname,callbacks in pairs(registry.insertQueue) do
-				local first = not rawget(events, event) or not next(events[event])	-- test for empty before. not test for one member after. that one member may have been overwritten.
+				local first = not rawget(events, eventname) or not next(events[eventname])	-- test for empty before. not test for one member after. that one member may have been overwritten.
-				for object,func in pairs(callbacks) do
+				for self,func in pairs(callbacks) do
-					events[event][object] = func
+					events[eventname][self] = func
 					-- fire OnUsed callback?
 					if first and registry.OnUsed then
-						registry.OnUsed(registry, target, event)
+						registry.OnUsed(registry, target, eventname)
 						first = nil
 					end
 				end

Libs/LibDBIcon-1.0/LibDBIcon-1.0.lua

@@ -1,4 +1,4 @@
---@curseforge-project-slug: libdbicon-1-0@
+
 -----------------------------------------------------------------------
 -- LibDBIcon-1.0
 --
@@ -6,7 +6,7 @@
 --
 
 local DBICON10 = "LibDBIcon-1.0"
-local DBICON10_MINOR = 57 -- Bump on changes
+local DBICON10_MINOR = 43 -- Bump on changes
 if not LibStub then error(DBICON10 .. " requires LibStub.") end
 local ldb = LibStub("LibDataBroker-1.1", true)
 if not ldb then error(DBICON10 .. " requires LibDataBroker-1.1.") end
@@ -16,24 +16,16 @@ if not lib then return end
 lib.objects = lib.objects or {}
 lib.callbackRegistered = lib.callbackRegistered or nil
 lib.callbacks = lib.callbacks or LibStub("CallbackHandler-1.0"):New(lib)
+lib.notCreated = lib.notCreated or {}
 lib.radius = lib.radius or 5
-local next, Minimap, CreateFrame, AddonCompartmentFrame = next, Minimap, CreateFrame, AddonCompartmentFrame
 lib.tooltip = lib.tooltip or CreateFrame("GameTooltip", "LibDBIconTooltip", UIParent, "GameTooltipTemplate")
+local next, Minimap = next, Minimap
 local isDraggingButton = false
 
 function lib:IconCallback(event, name, key, value)
 	if lib.objects[name] then
 		if key == "icon" then
 			lib.objects[name].icon:SetTexture(value)
-			if lib:IsButtonInCompartment(name) and lib:IsButtonCompartmentAvailable() then
-				local addonList = AddonCompartmentFrame.registeredAddons
-				for i =1, #addonList do
-					if addonList[i].text == name then
-						addonList[i].icon = value
-						return
-					end
-				end
-			end
 		elseif key == "iconCoords" then
 			lib.objects[name].icon:UpdateCoord()
 		elseif key == "iconR" then
@@ -103,33 +95,6 @@ local function onLeave(self)
 	end
 end
 
-local function onEnterCompartment(self, menu)
-	local buttonName = menu.text
-	local object = lib.objects[buttonName]
-	if object and object.dataObject then
-		if object.dataObject.OnTooltipShow then
-			lib.tooltip:SetOwner(self, "ANCHOR_NONE")
-			lib.tooltip:SetPoint(getAnchors(self))
-			object.dataObject.OnTooltipShow(lib.tooltip)
-			lib.tooltip:Show()
-		elseif object.dataObject.OnEnter then
-			object.dataObject.OnEnter(self)
-		end
-	end
-end
-
-local function onLeaveCompartment(self, menu)
-	lib.tooltip:Hide()
-
-	local buttonName = menu.text
-	local object = lib.objects[buttonName]
-	if object and object.dataObject then
-		if object.dataObject.OnLeave then
-			object.dataObject.OnLeave(self)
-		end
-	end
-end
-
 --------------------------------------------------------------------------------
 
 local onDragStart, updatePosition
@@ -248,39 +213,37 @@ local function updateCoord(self)
 	self:SetTexCoord(coords[1] + deltaX, coords[2] - deltaX, coords[3] + deltaY, coords[4] - deltaY)
 end
 
-local function createButton(name, object, db, customCompartmentIcon)
+local function createButton(name, object, db)
 	local button = CreateFrame("Button", "LibDBIcon10_"..name, Minimap)
 	button.dataObject = object
 	button.db = db
-	lib.objects[name] = button
-
 	button:SetFrameStrata("MEDIUM")
-	button:SetFixedFrameStrata(true)
+	button:SetSize(31, 31)
 	button:SetFrameLevel(8)
-	button:SetFixedFrameLevel(true)
 	button:RegisterForClicks("anyUp")
 	button:RegisterForDrag("LeftButton")
-	lib:ResetButtonHighlightTexture(name)
+	button:SetHighlightTexture(136477) --"Interface\\Minimap\\UI-Minimap-ZoomButton-Highlight"
-	lib:ResetButtonSize(name)
+	local overlay = button:CreateTexture(nil, "OVERLAY")
-
+	overlay:SetSize(53, 53)
-	local border = button:CreateTexture(nil, "OVERLAY")
+	overlay:SetTexture(136430) --"Interface\\Minimap\\MiniMap-TrackingBorder"
-	button.border = border
+	overlay:SetPoint("TOPLEFT")
-	lib:ResetButtonBorder(name)
-
 	local background = button:CreateTexture(nil, "BACKGROUND")
-	button.background = background
+	background:SetSize(20, 20)
-	lib:ResetButtonBackground(name)
+	background:SetTexture(136467) --"Interface\\Minimap\\UI-Minimap-Background"
-
+	background:SetPoint("TOPLEFT", 7, -5)
 	local icon = button:CreateTexture(nil, "ARTWORK")
+	icon:SetSize(17, 17)
 	icon:SetTexture(object.icon)
+	icon:SetPoint("TOPLEFT", 7, -6)
+	button.icon = icon
+	button.isMouseDown = false
+
 	local r, g, b = icon:GetVertexColor()
 	icon:SetVertexColor(object.iconR or r, object.iconG or g, object.iconB or b)
+
 	icon.UpdateCoord = updateCoord
 	icon:UpdateCoord()
-	button.icon = icon
-	lib:ResetButtonIcon(name)
 
-	button.isMouseDown = false
 	button:SetScript("OnEnter", onEnter)
 	button:SetScript("OnLeave", onLeave)
 	button:SetScript("OnClick", onClick)
@@ -300,6 +263,8 @@ local function createButton(name, object, db, customCompartmentIcon)
 	animOut:SetStartDelay(1)
 	button.fadeOut:SetToFinalAlpha(true)
 
+	lib.objects[name] = button
+
 	if lib.loggedIn then
 		updatePosition(button, db and db.minimapPos)
 		if not db or not db.hide then
@@ -308,18 +273,23 @@ local function createButton(name, object, db, customCompartmentIcon)
 			button:Hide()
 		end
 	end
-
-	if db and db.showInCompartment then
-		lib:AddButtonToCompartment(name, customCompartmentIcon)
-	end
 	lib.callbacks:Fire("LibDBIcon_IconCreated", button, name) -- Fire 'Icon Created' callback
 end
 
+-- We could use a metatable.__index on lib.objects, but then we'd create
+-- the icons when checking things like :IsRegistered, which is not necessary.
+local function check(name)
+	if lib.notCreated[name] then
+		createButton(name, lib.notCreated[name][1], lib.notCreated[name][2])
+		lib.notCreated[name] = nil
+	end
+end
+
 -- Wait a bit with the initial positioning to let any GetMinimapShape addons
 -- load up.
 if not lib.loggedIn then
-	local frame = CreateFrame("Frame")
+	local f = CreateFrame("Frame")
-	frame:SetScript("OnEvent", function(self)
+	f:SetScript("OnEvent", function(f)
 		for _, button in next, lib.objects do
 			updatePosition(button, button.db and button.db.minimapPos)
 			if not button.db or not button.db.hide then
@@ -329,9 +299,90 @@ if not lib.loggedIn then
 			end
 		end
 		lib.loggedIn = true
-		self:SetScript("OnEvent", nil)
+		f:SetScript("OnEvent", nil)
 	end)
-	frame:RegisterEvent("PLAYER_LOGIN")
+	f:RegisterEvent("PLAYER_LOGIN")
+end
+
+local function getDatabase(name)
+	return lib.notCreated[name] and lib.notCreated[name][2] or lib.objects[name].db
+end
+
+function lib:Register(name, object, db)
+	if not object.icon then error("Can't register LDB objects without icons set!") end
+	if lib.objects[name] or lib.notCreated[name] then error(DBICON10.. ": Object '".. name .."' is already registered.") end
+	if not db or not db.hide then
+		createButton(name, object, db)
+	else
+		lib.notCreated[name] = {object, db}
+	end
+end
+
+function lib:Lock(name)
+	if not lib:IsRegistered(name) then return end
+	if lib.objects[name] then
+		lib.objects[name]:SetScript("OnDragStart", nil)
+		lib.objects[name]:SetScript("OnDragStop", nil)
+	end
+	local db = getDatabase(name)
+	if db then
+		db.lock = true
+	end
+end
+
+function lib:Unlock(name)
+	if not lib:IsRegistered(name) then return end
+	if lib.objects[name] then
+		lib.objects[name]:SetScript("OnDragStart", onDragStart)
+		lib.objects[name]:SetScript("OnDragStop", onDragStop)
+	end
+	local db = getDatabase(name)
+	if db then
+		db.lock = nil
+	end
+end
+
+function lib:Hide(name)
+	if not lib.objects[name] then return end
+	lib.objects[name]:Hide()
+end
+
+function lib:Show(name)
+	check(name)
+	local button = lib.objects[name]
+	if button then
+		button:Show()
+		updatePosition(button, button.db and button.db.minimapPos or button.minimapPos)
+	end
+end
+
+function lib:IsRegistered(name)
+	return (lib.objects[name] or lib.notCreated[name]) and true or false
+end
+
+function lib:Refresh(name, db)
+	check(name)
+	local button = lib.objects[name]
+	if db then
+		button.db = db
+	end
+	updatePosition(button, button.db and button.db.minimapPos or button.minimapPos)
+	if not button.db or not button.db.hide then
+		button:Show()
+	else
+		button:Hide()
+	end
+	if not button.db or not button.db.lock then
+		button:SetScript("OnDragStart", onDragStart)
+		button:SetScript("OnDragStop", onDragStop)
+	else
+		button:SetScript("OnDragStart", nil)
+		button:SetScript("OnDragStop", nil)
+	end
+end
+
+function lib:GetMinimapButton(name)
+	return lib.objects[name]
 end
 
 do
@@ -354,83 +405,9 @@ do
 	end
 	Minimap:HookScript("OnEnter", OnMinimapEnter)
 	Minimap:HookScript("OnLeave", OnMinimapLeave)
-end
-
---------------------------------------------------------------------------------
--- Button API
---
-
-function lib:Register(name, object, db, customCompartmentIcon)
-	if not object.icon then error("Can't register LDB objects without icons set!") end
-	if lib:GetMinimapButton(name) then error(DBICON10.. ": Object '".. name .."' is already registered.") end
-	createButton(name, object, db, customCompartmentIcon)
-end
-
-function lib:Lock(name)
-	local button = lib:GetMinimapButton(name)
-	if button then
-		button:SetScript("OnDragStart", nil)
-		button:SetScript("OnDragStop", nil)
-		if button.db then
-			button.db.lock = true
-		end
-	end
-end
-
-function lib:Unlock(name)
-	local button = lib:GetMinimapButton(name)
-	if button then
-		button:SetScript("OnDragStart", onDragStart)
-		button:SetScript("OnDragStop", onDragStop)
-		if button.db then
-			button.db.lock = nil
-		end
-	end
-end
-
-function lib:Hide(name)
-	local button = lib:GetMinimapButton(name)
-	if button then
-		button:Hide()
-	end
-end
-
-function lib:Show(name)
-	local button = lib:GetMinimapButton(name)
-	if button then
-		button:Show()
-		updatePosition(button, button.db and button.db.minimapPos or button.minimapPos)
-	end
-end
-
-function lib:IsRegistered(name)
-	return lib.objects[name] and true or false
-end
-
-function lib:Refresh(name, db)
-	local button = lib:GetMinimapButton(name)
-	if button then
-		if db then
-			button.db = db
-		end
-		updatePosition(button, button.db and button.db.minimapPos or button.minimapPos)
-		if not button.db or not button.db.hide then
-			button:Show()
-		else
-			button:Hide()
-		end
-		if not button.db or not button.db.lock then
-			button:SetScript("OnDragStart", onDragStart)
-			button:SetScript("OnDragStop", onDragStop)
-		else
-			button:SetScript("OnDragStart", nil)
-			button:SetScript("OnDragStop", nil)
-		end
-	end
-end
 
 	function lib:ShowOnEnter(name, value)
-	local button = lib:GetMinimapButton(name)
+		local button = lib.objects[name]
 		if button then
 			if value then
 				button.showOnMouseover = true
@@ -443,9 +420,6 @@ function lib:ShowOnEnter(name, value)
 			end
 		end
 	end
-
-function lib:GetMinimapButton(name)
-	return lib.objects[name]
 end
 
 function lib:GetButtonList()
@@ -469,224 +443,9 @@ function lib:SetButtonToPosition(button, position)
 	updatePosition(lib.objects[button] or button, position)
 end
 
--- Button Configuration
+-- Upgrade!
-function lib:SetButtonSize(name, size)
-	local button = lib:GetMinimapButton(name)
-	if button and type(size) == "number" then
-		button:SetSize(size, size)
-	end
-end
-
-function lib:ResetButtonSize(name)
-	local button = lib:GetMinimapButton(name)
-	if button then
-		button:SetSize(31, 31)
-	end
-end
-
-function lib:SetButtonHighlightTexture(name, highlightTexture)
-	local button = lib:GetMinimapButton(name)
-	if button and (type(highlightTexture) == "number" or type(highlightTexture) == "string") then
-		button:SetHighlightTexture(highlightTexture)
-	end
-end
-
-function lib:ResetButtonHighlightTexture(name)
-	local button = lib:GetMinimapButton(name)
-	if button then
-		button:SetHighlightTexture(136477) --"Interface\\Minimap\\UI-Minimap-ZoomButton-Highlight"
-	end
-end
-
--- Border configuration
-function lib:RemoveButtonBorder(name)
-	local button = lib:GetMinimapButton(name)
-	if button.border then
-		button.border:Hide()
-	end
-end
-
-function lib:SetButtonBorder(name, borderTexture, size, framePoint, offsetX, offsetY)
-	local button = lib:GetMinimapButton(name)
-	if button.border then
-		lib:ResetButtonBorder(name)
-		if type(borderTexture) == "number" or type(borderTexture) == "string" then
-			button.border:SetTexture(borderTexture)
-		end
-		if type(size) == "number" then
-			button.border:SetSize(size, size)
-		end
-		if type(framePoint) == "string" then
-			button.border:ClearAllPoints()
-			button.border:SetPoint(framePoint, type(offsetX) == "number" and offsetX or 0, type(offsetY) == "number" and offsetY or 0)
-		end
-	end
-end
-
-function lib:ResetButtonBorder(name)
-	local button = lib:GetMinimapButton(name)
-	if button.border then
-		button.border:Show()
-		button.border:ClearAllPoints()
-		button.border:SetPoint("TOPLEFT", 0, 0)
-		button.border:SetTexture(136430) --"Interface\\Minimap\\MiniMap-TrackingBorder"
-		if lib:IsButtonCompartmentAvailable() then
-			button.border:SetSize(50, 50)
-		else
-			button.border:SetSize(53, 53)
-		end
-	end
-end
-
--- Background configuration
-function lib:RemoveButtonBackground(name)
-	local button = lib:GetMinimapButton(name)
-	if button.background then
-		button.background:Hide()
-	end
-end
-
-function lib:SetButtonBackground(name, backgroundTexture, size, framePoint, offsetX, offsetY)
-	local button = lib:GetMinimapButton(name)
-	if button.background then
-		lib:ResetButtonBackground(name)
-		if type(backgroundTexture) == "number" or type(backgroundTexture) == "string" then
-			button.background:SetTexture(backgroundTexture)
-		end
-		if type(size) == "number" then
-			button.background:SetSize(size, size)
-		end
-		if type(framePoint) == "string" then
-			button.background:ClearAllPoints()
-			button.background:SetPoint(framePoint, type(offsetX) == "number" and offsetX or 0, type(offsetY) == "number" and offsetY or 0)
-		end
-	end
-end
-
-function lib:ResetButtonBackground(name)
-	local button = lib:GetMinimapButton(name)
-	if button.background then
-		button.background:Show()
-		button.background:ClearAllPoints()
-		button.background:SetTexture(136467) --"Interface\\Minimap\\UI-Minimap-Background"
-		if lib:IsButtonCompartmentAvailable() then
-			button.background:SetSize(24, 24)
-			button.background:SetPoint("CENTER", 0, 0)
-		else
-			button.background:SetSize(20, 20)
-			button.background:SetPoint("TOPLEFT", 7, -5)
-		end
-	end
-end
-
--- Icon Configuration
-function lib:SetButtonIcon(name, iconTexture, size, framePoint, offsetX, offsetY)
-	local button = lib:GetMinimapButton(name)
-	if button.icon then
-		lib:ResetButtonIcon(name)
-		if type(iconTexture) == "number" or type(iconTexture) == "string" then
-			button.icon:SetTexture(iconTexture)
-		end
-		if type(size) == "number" then
-			button.icon:SetSize(size, size)
-		end
-		if type(framePoint) == "string" then
-			button.icon:ClearAllPoints()
-			button.icon:SetPoint(framePoint, type(offsetX) == "number" and offsetX or 0, type(offsetY) == "number" and offsetY or 0)
-		end
-	end
-end
-
-function lib:ResetButtonIcon(name)
-	local button = lib:GetMinimapButton(name)
-	if button.icon then
-		button.icon:SetTexture(button.dataObject.icon)
-		button.icon:UpdateCoord()
-		local r, g, b = button.icon:GetVertexColor()
-		button.icon:SetVertexColor(button.dataObject.iconR or r, button.dataObject.iconG or g, button.dataObject.iconB or b)
-		if lib:IsButtonCompartmentAvailable() then
-			button.icon:SetSize(18, 18)
-			button.icon:ClearAllPoints()
-			button.icon:SetPoint("CENTER")
-		else
-			button.icon:SetSize(17, 17)
-			button.icon:ClearAllPoints()
-			button.icon:SetPoint("TOPLEFT", 7, -6)
-		end
-	end
-end
-
---------------------------------------------------------------------------------
--- Addon Compartment API
---
-
-if AddonCompartmentFrame then
-	function lib:IsButtonCompartmentAvailable()
-		return true
-	end
-else
-	function lib:IsButtonCompartmentAvailable()
-		return false
-	end
-end
-
-function lib:IsButtonInCompartment(buttonName)
-	local object = lib.objects[buttonName]
-	if object and object.db and object.db.showInCompartment then
-		return true
-	end
-	return false
-end
-
-function lib:AddButtonToCompartment(buttonName, customIcon)
-	if lib:IsButtonCompartmentAvailable() then
-		local object = lib.objects[buttonName]
-		if object and not object.compartmentData then
-			if object.db then
-				object.db.showInCompartment = true
-			end
-			object.compartmentData = {
-				text = buttonName,
-				icon = customIcon or object.dataObject.icon,
-				notCheckable = true,
-				registerForAnyClick = true,
-				func = function(_, menuInputData, menu)
-					object.dataObject.OnClick(menu, menuInputData.buttonName)
-				end,
-				funcOnEnter = onEnterCompartment,
-				funcOnLeave = onLeaveCompartment,
-			}
-			AddonCompartmentFrame:RegisterAddon(object.compartmentData)
-		end
-	end
-end
-
-function lib:RemoveButtonFromCompartment(buttonName)
-	if lib:IsButtonCompartmentAvailable() then
-		local object = lib.objects[buttonName]
-		if object and object.compartmentData then
-			for i = 1, #AddonCompartmentFrame.registeredAddons do
-				local entry = AddonCompartmentFrame.registeredAddons[i]
-				if entry == object.compartmentData then
-					object.compartmentData = nil
-					if object.db then
-						object.db.showInCompartment = nil
-					end
-					table.remove(AddonCompartmentFrame.registeredAddons, i)
-					AddonCompartmentFrame:UpdateDisplay()
-					return
-				end
-			end
-		end
-	end
-end
-
---------------------------------------------------------------------------------
--- Upgrades
---
-
 for name, button in next, lib.objects do
-	local db = button.db
+	local db = getDatabase(name)
 	if not db or not db.lock then
 		button:SetScript("OnDragStart", onDragStart)
 		button:SetScript("OnDragStop", onDragStop)
@@ -709,9 +468,3 @@ for name, button in next, lib.objects do
 	end
 end
 lib:SetButtonRadius(lib.radius) -- Upgrade to 40
-if lib.notCreated then -- Upgrade to 50
-	for name in next, lib.notCreated do
-		createButton(name, lib.notCreated[name][1], lib.notCreated[name][2])
-	end
-	lib.notCreated = nil
-end

Libs/LibStub/LibStub.lua

@@ -10,7 +10,7 @@ if not LibStub or LibStub.minor < LIBSTUB_MINOR then
 	
 	function LibStub:NewLibrary(major, minor)
 		assert(type(major) == "string", "Bad argument #2 to `NewLibrary' (string expected)")
-		minor = assert(tonumber(string.match(minor, "%d+")), "Minor version must either be a number or contain a number.")
+		minor = assert(tonumber(strmatch(minor, "%d+")), "Minor version must either be a number or contain a number.")
 		
 		local oldminor = self.minors[major]
 		if oldminor and oldminor >= minor then return nil end

Libs/LibStub/LibStub.toc

@@ -0,0 +1,9 @@
+## Interface: 20400
+## Title: Lib: LibStub
+## Notes: Universal Library Stub
+## Credits: Kaelten, Cladhaire, ckknight, Mikk, Ammo, Nevcairiel
+## X-Website: http://jira.wowace.com/browse/LS
+## X-Category: Library
+## X-License: Public Domain	
+
+LibStub.lua

README.md

@@ -1,6 +1,6 @@
 # Grichelde - Text replacer
 
-Grichelde is a WoW Addon for Classic, Wrath of the Lich King Classic and Retail (Shadowlands) that replaces any characters or words you typed in a chat input line according to your replacement rules.
+Grichelde is a WoW Classic Addon that replaces any characters or words you typed in a chat input line according to your replacement rules.
 The replacement is done **before** the text is send to other players/in the target channel. It does **not** change text other players have written in the chat, but the text they will see **from you**.
 
 Its purpose is to simulate a speaking disability of your toon and hereby strengthen immersion in roleplay. 
@@ -39,7 +39,7 @@ Only slash commands, item links, textures, placeholders and ooc-markers are excl
 
 After entering a search or replacement text, you see a button "Okay" next to your input. This is **not** a validation message, 
 but the save button for text. This is a restriction from the UI library and can be seen in other addons as well. 
-Please click on "Okay" to save the input permanently, otherwise it will not be stored.
+Please click on "Okay" to save the input permanently, otherwise it will not be stored..
 
 ![click "Okay" on text changes](https://media.forgecdn.net/attachments/305/887/text-okay.jpg "change confirmation")
 

libs.xml

@@ -0,0 +1,17 @@
+<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
+..\FrameXML\UI.xsd">
+
+  <Script file="Libs\LibStub\LibStub.lua"/>
+  <Include file="Libs\CallbackHandler-1.0\CallbackHandler-1.0.xml"/>
+  <Include file="Libs\AceAddon-3.0\AceAddon-3.0.xml"/>
+  <Include file="Libs\AceLocale-3.0\AceLocale-3.0.xml" />
+  <Include file="Libs\AceEvent-3.0\AceEvent-3.0.xml" />
+  <Include file="Libs\AceHook-3.0\AceHook-3.0.xml"/>
+  <Include file="Libs\AceConsole-3.0\AceConsole-3.0.xml"/>
+  <Include file="Libs\AceDB-3.0\AceDB-3.0.xml"/>
+  <Include file="Libs\AceDBOptions-3.0\AceDBOptions-3.0.xml"/>
+  <Include file="Libs\AceGUI-3.0\AceGUI-3.0.xml"/>
+  <Include file="Libs\AceConfig-3.0\AceConfig-3.0.xml"/>
+  <Script file="Libs\LibDataBroker-1.1\LibDataBroker-1.1.lua" />
+  <Script file="Libs\LibDBIcon-1.0\LibDBIcon-1.0.lua" />
+</Ui>

localisation/deDE.lua

@@ -15,7 +15,7 @@ local cPrefix    = Grichelde.F.cPrefix
 L.AddonName = "Grichelde"
 L.AddonNamePlusVersion = "%s v%s"
 L.AddonLoaded = "%s unterst\195\188tzt Euch jetzt bei euren Sprachschwierigkeiten."
-L.AddonUnloaded = "%s erwartet geduldig Euch weiter unterst\195\188tzen zu d\195\188rfen."
+L.AddonUnloaded = "%s wartet geduldig Euch weiter unterst\195\188tzen zu d\195\188rfen."
 L.Upgrade_ToVersion = "Hebe Databank auf Version %s an."
 L.Upgrade_Successful = "Upgrade erfolgreich."
 L.Upgrade_Error = "Upgrade fehlgeschlagen!"
@@ -33,8 +33,6 @@ L.Error_InvalidCommand = "Ung\195\188ltiger Befehl"
 L.Error_InvalidChannel = "Ung\195\188ltiger Kanal"
 L.Error_InvalidWhisperTarget = "Ung\195\188ltiger Fl\195\188sterziel"
 L.Error_UnsupportedChannel = "Nicht unterst\195\188tzter Kanal"
-L.Chat_Lockdown_Notice = "Der Chat ist w\195\164hrend dieses Kampfes durch das Spiel gesperrt, Grichelde hält sich zurück."
-L.Chat_Lockdown_Suffix = "(ignoriert von Grichelde)"
 
 -- profiles
 L.Profiles_Available = "Verf\195\188gbare Profile:"

localisation/enUS.lua

@@ -15,7 +15,7 @@ local cPrefix    = Grichelde.F.cPrefix
 L.AddonName = "Grichelde"
 L.AddonNamePlusVersion = "%s v%s"
 L.AddonLoaded = "%s happily assists you with your spelling disabilities now."
-L.AddonUnloaded = "%s patiently awaits to support you again."
+L.AddonUnloaded = "%s patiently waits to support you again when needed."
 L.Upgrade_ToVersion = "Upgrade database to version %s."
 L.Upgrade_Successful = "Upgrade successful."
 L.Upgrade_Error = "Upgrade failed!"
@@ -33,8 +33,6 @@ L.Error_InvalidCommand = "Invalid command"
 L.Error_InvalidChannel = "Invalid channel"
 L.Error_InvalidWhisperTarget = "Invalid whisper target"
 L.Error_UnsupportedChannel = "Unsupported channel"
-L.Chat_Lockdown_Notice = "Chat is locked by the game during this encounter. Grichelde will remain passive."
-L.Chat_Lockdown_Suffix = "(ignored by Grichelde)"
 
 -- profiles
 L.Profiles_Available = "Available profiles:"