Merge remote-tracking branch 'origin/main'

This commit is contained in:
Core 2022-07-12 21:26:09 +01:00
commit 773c748b7d
No known key found for this signature in database
GPG key ID: FE9BF1B547F8F3C6
9 changed files with 113 additions and 564 deletions

View file

@ -86,6 +86,7 @@ export class BrowserWindow {
"pages/zoo",
"pages/plugin-renderer",
"pages/oobe",
"pages/cider-profile",
"components/app-content",
"components/sidebar",
"components/mediaitem-artwork",
@ -193,6 +194,10 @@ export class BrowserWindow {
page: "recordLabel_",
component: `<cider-recordlabel :data="$root.showingPlaylist"></cider-recordlabel>`,
condition: `$root.page.includes('recordLabel_')`
}, {
page: "social-profiles_",
component: `<cider-socialprofile :data="$root.showingPlaylist"></cider-socialprofile>`,
condition: `$root.page.includes('social-profiles_')`
}, {
page: "multiroom",
component: `<cider-multiroom :data="$root.multiroom"></cider-multiroom>`,

View file

@ -69,6 +69,11 @@
"component": "<cider-playlist :data=\"showingPlaylist\"></cider-playlist>",
"condition": "page.includes('album_')"
},
{
"page": "social-profiles_",
"component": "<cider-socialprofile :data=\"showingPlaylist\"></cider-socialprofile>",
"condition": "$root.page.includes('social-profiles_')"
},
{
"page": "recordLabel_",
"component": "<cider-recordlabel :data=\"showingPlaylist\"></cider-recordlabel>",