From 28ebc378e045fd8bafe32e1c9bb4c3c7462d75c0 Mon Sep 17 00:00:00 2001 From: Cinder Date: Tue, 3 Sep 2024 02:07:26 -0700 Subject: [PATCH] [JS] Fix an error in older browsers caused by replaceAll (#747) Fixes #744 --- app/javascript/src/javascripts/autocomplete.js.erb | 2 +- app/javascript/src/javascripts/forum_topics.js | 2 +- app/javascript/src/javascripts/models/Filter.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/javascript/src/javascripts/autocomplete.js.erb b/app/javascript/src/javascripts/autocomplete.js.erb index 50aaa7597..a3b2db19d 100644 --- a/app/javascript/src/javascripts/autocomplete.js.erb +++ b/app/javascript/src/javascripts/autocomplete.js.erb @@ -279,7 +279,7 @@ Autocomplete.render_item = function(list, item) { if (item.type === "tag") { $link.addClass("tag-type-" + item.category); } else if (item.type === "user") { - var level_class = "user-" + item.level.replaceAll(" ", "-").toLowerCase(); + var level_class = "user-" + item.level.replace(/ /g, "-").toLowerCase(); $link.addClass(level_class); if (Utility.meta("style-usernames") === "true") { $link.addClass("with-style"); diff --git a/app/javascript/src/javascripts/forum_topics.js b/app/javascript/src/javascripts/forum_topics.js index d65f93b17..d774c986d 100644 --- a/app/javascript/src/javascripts/forum_topics.js +++ b/app/javascript/src/javascripts/forum_topics.js @@ -2,7 +2,7 @@ let ForumTopic = {}; ForumTopic.init_mark_all_as_read = function () { $("#subnav-mark-all-as-read-link").on("click.danbooru", () => { - return confirm(`Are you sure that you want to mark all ${$("body").data("controller").replaceAll("-", " ")} as read?`); + return confirm(`Are you sure that you want to mark all ${$("body").data("controller").replace(/-/g, " ")} as read?`); }); }; diff --git a/app/javascript/src/javascripts/models/Filter.js b/app/javascript/src/javascripts/models/Filter.js index c222c18b8..f8d5e85d1 100644 --- a/app/javascript/src/javascripts/models/Filter.js +++ b/app/javascript/src/javascripts/models/Filter.js @@ -140,7 +140,7 @@ class FilterToken { this.type = FilterUtils.getFilterType(raw); if (this.type !== "tag") raw = raw.slice(this.type.length + 1); else if (raw.includes("*")) { - this.value = new RegExp(raw.replaceAll(/\*/g, ".*")); + this.value = new RegExp(raw.replace(/\*/g, ".*")); this.type = "wildcard"; return; }