drop nomerge headers

Closes #4105
WeakAuras · Jan 20, 2025 · 2a01063 · 2a01063
1 parent 20c0d64
commit 2a01063
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/WeakAuras/Modernize.lua b/WeakAuras/Modernize.lua
@@ -2367,6 +2367,17 @@ function Private.Modernize(data, oldSnapshot)
     end
   end
 
+  if data.internalVersion < 82 then
+    -- noMerge for separator custom option doesn't make sense,
+    -- and groups achieve the desired effect better,
+    -- so drop the feature
+    for _, optionData in ipairs(data.authorOptions) do
+      if optionData.type == "header" then
+        optionData.noMerge = nil
+      end
+    end
+  end
+
   data.internalVersion = max(data.internalVersion or 0, WeakAuras.InternalVersion())
 end
 

diff --git a/WeakAuras/Types.lua b/WeakAuras/Types.lua
@@ -3805,7 +3805,6 @@ Private.author_option_fields = {
   header = {
     useName = false,
     text = "",
-    noMerge = false
   },
   group = {
     groupType = "simple",

diff --git a/WeakAuras/WeakAuras.lua b/WeakAuras/WeakAuras.lua
@@ -3,7 +3,7 @@ local AddonName = ...
 ---@class Private
 local Private = select(2, ...)
 
-local internalVersion = 81
+local internalVersion = 82
 
 -- Lua APIs
 local insert = table.insert

diff --git a/WeakAurasOptions/AuthorOptions.lua b/WeakAurasOptions/AuthorOptions.lua
@@ -1194,15 +1194,6 @@ typeControlAdders = {
         return not option.useName
       end
     }
-    args[prefix .. "noMerge"] = {
-      type = "toggle",
-      name = name(option, "noMerge", L["Prevent Merging"]),
-      desc = desc(option, "noMerge", L["If checked, then this separator will not merge with other separators when selecting multiple auras."]),
-      order = order(),
-      width = WeakAuras.doubleWidth,
-      get = get(option, "noMerge"),
-      set = set(data, option, "noMerge"),
-    }
   end,
   group = function(options, args, data, order, prefix, i)
     local option = options[i]