Use more Regex to improve variant names building

This commit is contained in:
Romain Vigier
2019-10-16 17:26:57 +02:00
parent 65606dc617
commit 0b94f828cb
+3 -3
View File
@@ -59,15 +59,15 @@ function _build_theme_variants() {
user_theme_night = 'HighContrastInverse'; user_theme_night = 'HighContrastInverse';
} }
else if ( original_user_theme.match(/Materia.*-compact/g) ) { else if ( original_user_theme.match(/Materia.*-compact/g) ) {
user_theme_day = original_user_theme.replace('-dark', ''); user_theme_day = original_user_theme.replace(/-dark(?!er)/g, '');
user_theme_night = user_theme_day.replace(/(-light)?-compact/g, '-dark-compact'); user_theme_night = user_theme_day.replace(/(-light)?-compact/g, '-dark-compact');
} }
else if ( original_user_theme.includes('Arc') ) { else if ( original_user_theme.includes('Arc') ) {
user_theme_day = original_user_theme.replace('-Dark', ''); user_theme_day = original_user_theme.replace(/-Dark(?!er)/g, '');
user_theme_night = user_theme_day.replace('-Darker', '') + '-Dark'; user_theme_night = user_theme_day.replace('-Darker', '') + '-Dark';
} }
else { else {
user_theme_day = original_user_theme.replace('-dark', ''); user_theme_day = original_user_theme.replace(/-dark(?!er)/g, '');
user_theme_night = user_theme_day.replace(/(-light)?(-darker)?/g, '') + '-dark'; user_theme_night = user_theme_day.replace(/(-light)?(-darker)?/g, '') + '-dark';
} }
} }