From 665849615c5e0ef6f677788e9e0f7ab0b3359a43 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Tue, 4 Aug 2026 18:29:35 +0300 Subject: [PATCH] fixes --- src/components/registration/registration.js | 2 +- src/components/settings_modal/helpers/setting.js | 4 ++-- src/services/entity_normalizer/entity_normalizer.service.js | 4 ++-- src/services/style_setter/style_setter.js | 4 ++-- src/services/theme_data/iss_utils.js | 6 ------ src/services/user_highlighter/user_highlighter.js | 2 +- test/unit/specs/components/rich_content.spec.js | 4 ++-- 7 files changed, 10 insertions(+), 16 deletions(-) diff --git a/src/components/registration/registration.js b/src/components/registration/registration.js index 7e0cf859c..bb8de17b9 100644 --- a/src/components/registration/registration.js +++ b/src/components/registration/registration.js @@ -154,7 +154,7 @@ const registration = { }) }, replaceNewlines(str) { - return str.replaceAll('\s*\n\s*', ' \n') + return str.replaceAll(/\s*\n\s*/g, ' \n') }, }, } diff --git a/src/components/settings_modal/helpers/setting.js b/src/components/settings_modal/helpers/setting.js index a2d33deff..09d3ecc2d 100644 --- a/src/components/settings_modal/helpers/setting.js +++ b/src/components/settings_modal/helpers/setting.js @@ -179,7 +179,7 @@ export default { [ 'admin_dash', 'temp_overrides', - ...this.canonPath.map((p) => p.replaceAll('\.', '_DOT_')), + ...this.canonPath.map((p) => p.replaceAll('.', '_DOT_')), 'label', ].join('.'), ) @@ -198,7 +198,7 @@ export default { [ 'admin_dash', 'temp_overrides', - ...this.canonPath.map((p) => p.replaceAll('\.', '_DOT_')), + ...this.canonPath.map((p) => p.replaceAll('.', '_DOT_')), 'description', ].join('.'), ) diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js index 9eea7e459..5b8fa5b57 100644 --- a/src/services/entity_normalizer/entity_normalizer.service.js +++ b/src/services/entity_normalizer/entity_normalizer.service.js @@ -62,8 +62,8 @@ export const parseUser = (data) => { }) output.fields_text = data.fields.map((field) => { return { - name: unescape(field.name.replaceAll('<[^>]*>', '')), - value: unescape(field.value.replaceAll('<[^>]*>', '')), + name: unescape(field.name.replaceAll(/<[^>]*>/g, '')), + value: unescape(field.value.replaceAll(/<[^>]*>/g, '')), } }) diff --git a/src/services/style_setter/style_setter.js b/src/services/style_setter/style_setter.js index 0cab385a3..4eed080c1 100644 --- a/src/services/style_setter/style_setter.js +++ b/src/services/style_setter/style_setter.js @@ -29,7 +29,7 @@ export const createStyleSheet = (id, priority = 1000) => { addRule(rule) { let newRule = rule if (!CSS.supports?.('backdrop-filter', 'blur()')) { - newRule = newRule.replaceAll('backdrop-filter:[^;]+;', '') // Remove backdrop-filter + newRule = newRule.replaceAll(/backdrop-filter:[^;]+;/g, '') // Remove backdrop-filter } if (newRule.startsWith('::-webkit')) { @@ -44,7 +44,7 @@ export const createStyleSheet = (id, priority = 1000) => { } this.rules.push( - newRule.replaceAll('var\(--shadowFilter\)[^;]*;', ''), // Remove shadowFilter references + newRule.replaceAll(/var\(--shadowFilter\)[^;]*;/g, ''), // Remove shadowFilter references ) }, } diff --git a/src/services/theme_data/iss_utils.js b/src/services/theme_data/iss_utils.js index 3dc3aa65d..67579a118 100644 --- a/src/services/theme_data/iss_utils.js +++ b/src/services/theme_data/iss_utils.js @@ -111,12 +111,6 @@ export const genericRuleToSelector = if (ignoreOutOfTreeSelector || liteMode) arraySelector = [arraySelector[0]] return arraySelector - .sort((a) => { - if (a.startsWith(':')) return 1 - if (/^[a-z]/.exec(a)) return -1 - else return 0 - }) - .join('') }) const statesSelectorsFlat = statesSelectors.reduce((acc, s) => { diff --git a/src/services/user_highlighter/user_highlighter.js b/src/services/user_highlighter/user_highlighter.js index 9724595c0..e3f94ea1a 100644 --- a/src/services/user_highlighter/user_highlighter.js +++ b/src/services/user_highlighter/user_highlighter.js @@ -47,7 +47,7 @@ const highlightStyle = (prefs) => { const highlightClass = (user) => { return ( - 'USER____' + user.screen_name?.replaceAll('\.', '_').replace(/@/g, '_AT_') + 'USER____' + user.screen_name?.replaceAll('.', '_').replace(/@/g, '_AT_') ) } diff --git a/test/unit/specs/components/rich_content.spec.js b/test/unit/specs/components/rich_content.spec.js index 6ea574304..ebdf4ef45 100644 --- a/test/unit/specs/components/rich_content.spec.js +++ b/test/unit/specs/components/rich_content.spec.js @@ -363,7 +363,7 @@ describe('RichContent', () => { }) expect( - wrapper.html().replaceAll('\n', '').replaceAll('', ''), + wrapper.html().replaceAll('\n', '').replaceAll(//g, ''), ).to.eql(compwrap(expected)) }) @@ -433,7 +433,7 @@ describe('RichContent', () => { }) expect( - wrapper.html().replaceAll('\n', '').replaceAll('', ''), + wrapper.html().replaceAll('\n', '').replaceAll(//g, ''), ).to.eql(compwrap(expected)) })