zoriya/noctalia-shell
1
0
Fork 0
mirror of https://github.com/zoriya/noctalia-shell.git synced 2026-08-15 18:43:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: Revert regex interpretation to require // delimiters and update en.json placeholder

Browse Source
This commit is contained in:
loner
2025-10-23 00:42:50 +08:00
parent 272bb50770
commit 1d5eb91803
2 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/Bar/Widgets/CustomButton.qml
+24 -10
View File
@@ -104,11 +104,18 @@ Item {
var shouldCollapse = false
if (textCollapse && textCollapse.length > 0) {
try {
var regex = new RegExp(textCollapse)
shouldCollapse = regex.test(lineStr)
} catch (e) {
// If it's not a valid regex, treat it as a plain string
if (textCollapse.startsWith("/") && textCollapse.endsWith("/") && textCollapse.length > 1) {
// Treat as regex
var pattern = textCollapse.substring(1, textCollapse.length - 1)
try {
var regex = new RegExp(pattern)
shouldCollapse = regex.test(lineStr)
} catch (e) {
Logger.w("CustomButton", `Invalid regex for textCollapse: ${textCollapse} - ${e.message}`)
shouldCollapse = (textCollapse === lineStr) // Fallback to exact match on invalid regex
}
} else {
// Treat as plain string
shouldCollapse = (textCollapse === lineStr)
}
}
@@ -131,11 +138,18 @@ Item {
var shouldCollapse = false
if (textCollapse && textCollapse.length > 0) {
try {
var regex = new RegExp(textCollapse)
shouldCollapse = regex.test(out)
} catch (e) {
// If it's not a valid regex, treat it as a plain string
if (textCollapse.startsWith("/") && textCollapse.endsWith("/") && textCollapse.length > 1) {
// Treat as regex
var pattern = textCollapse.substring(1, textCollapse.length - 1)
try {
var regex = new RegExp(pattern)
shouldCollapse = regex.test(out)
} catch (e) {
Logger.w("CustomButton", `Invalid regex for textCollapse: ${textCollapse} - ${e.message}`)
shouldCollapse = (textCollapse === out) // Fallback to exact match on invalid regex
}
} else {
// Treat as plain string
shouldCollapse = (textCollapse === out)
}
}