Merge branch 'develop' of https://github.com/ciderapp/Cider into develop
This commit is contained in:
commit
f8000c2baa
1 changed files with 11 additions and 11 deletions
|
@ -1852,10 +1852,10 @@ const app = new Vue({
|
||||||
}
|
}
|
||||||
|
|
||||||
// remove any non-alphanumeric characters and spaces from search term and item name
|
// remove any non-alphanumeric characters and spaces from search term and item name
|
||||||
searchTerm = searchTerm.replace(/[^a-z0-9 ]/gi, "")
|
searchTerm = searchTerm.replace(/[^\p{L}\p{N} ]/gu, "")
|
||||||
itemName = itemName.replace(/[^a-z0-9 ]/gi, "")
|
itemName = itemName.replace(/[^\p{L}\p{N} ]/gu, "")
|
||||||
artistName = artistName.replace(/[^a-z0-9 ]/gi, "")
|
artistName = artistName.replace(/[^\p{L}\p{N} ]/gu, "")
|
||||||
albumName = albumName.replace(/[^a-z0-9 ]/gi, "")
|
albumName = albumName.replace(/[^\p{L}\p{N} ]/gu, "")
|
||||||
|
|
||||||
if (itemName.includes(searchTerm) || artistName.includes(searchTerm) || albumName.includes(searchTerm)) {
|
if (itemName.includes(searchTerm) || artistName.includes(searchTerm) || albumName.includes(searchTerm)) {
|
||||||
return item
|
return item
|
||||||
|
@ -1921,10 +1921,10 @@ const app = new Vue({
|
||||||
}
|
}
|
||||||
|
|
||||||
// remove any non-alphanumeric characters and spaces from search term and item name
|
// remove any non-alphanumeric characters and spaces from search term and item name
|
||||||
searchTerm = searchTerm.replace(/[^a-z0-9 ]/gi, "")
|
searchTerm = searchTerm.replace(/[^\p{L}\p{N} ]/gu, "")
|
||||||
itemName = itemName.replace(/[^a-z0-9 ]/gi, "")
|
itemName = itemName.replace(/[^\p{L}\p{N} ]/gu, "")
|
||||||
artistName = artistName.replace(/[^a-z0-9 ]/gi, "")
|
artistName = artistName.replace(/[^\p{L}\p{N} ]/gu, "")
|
||||||
albumName = albumName.replace(/[^a-z0-9 ]/gi, "")
|
albumName = albumName.replace(/[^\p{L}\p{N} ]/gu, "")
|
||||||
|
|
||||||
if (itemName.includes(searchTerm) || artistName.includes(searchTerm) || albumName.includes(searchTerm)) {
|
if (itemName.includes(searchTerm) || artistName.includes(searchTerm) || albumName.includes(searchTerm)) {
|
||||||
return item
|
return item
|
||||||
|
@ -1986,8 +1986,8 @@ const app = new Vue({
|
||||||
// }
|
// }
|
||||||
|
|
||||||
// remove any non-alphanumeric characters and spaces from search term and item name
|
// remove any non-alphanumeric characters and spaces from search term and item name
|
||||||
searchTerm = searchTerm.replace(/[^a-z0-9 ]/gi, "")
|
searchTerm = searchTerm.replace(/[^\p{L}\p{N} ]/gu, "")
|
||||||
itemName = itemName.replace(/[^a-z0-9 ]/gi, "")
|
itemName = itemName.replace(/[^\p{L}\p{N} ]/gu, "")
|
||||||
|
|
||||||
|
|
||||||
if (itemName.includes(searchTerm) || artistName.includes(searchTerm) || albumName.includes(searchTerm)) {
|
if (itemName.includes(searchTerm) || artistName.includes(searchTerm) || albumName.includes(searchTerm)) {
|
||||||
|
@ -4011,4 +4011,4 @@ const app = new Vue({
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
export { app }
|
export { app }
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue