fix/revert privateMode to avoid conflict with keyword
This commit is contained in:
parent
3cdcfe19f4
commit
e3a441310f
5 changed files with 6 additions and 12 deletions
|
|
@ -33,7 +33,7 @@
|
||||||
</router-link>
|
</router-link>
|
||||||
<div class="item right actions">
|
<div class="item right actions">
|
||||||
<search-bar
|
<search-bar
|
||||||
v-if="currentUser || !privateMode"
|
v-if="currentUser || !private"
|
||||||
@toggled="onSearchBarToggled"
|
@toggled="onSearchBarToggled"
|
||||||
@click.stop
|
@click.stop
|
||||||
/>
|
/>
|
||||||
|
|
|
||||||
|
|
@ -16,10 +16,9 @@ export const ListsMenuContent = {
|
||||||
...mapPiniaState(useListsStore, {
|
...mapPiniaState(useListsStore, {
|
||||||
lists: getListEntries,
|
lists: getListEntries,
|
||||||
}),
|
}),
|
||||||
|
...mapPiniaState(useInstanceStore, ['private','federating']),
|
||||||
...mapState({
|
...mapState({
|
||||||
currentUser: (state) => state.users.currentUser,
|
currentUser: (state) => state.users.currentUser,
|
||||||
privateMode: (state) => useInstanceStore().private,
|
|
||||||
federating: (state) => useInstanceStore().federating,
|
|
||||||
}),
|
}),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -112,8 +112,9 @@ const NavPanel = {
|
||||||
unreadAnnouncementCount: 'unreadAnnouncementCount',
|
unreadAnnouncementCount: 'unreadAnnouncementCount',
|
||||||
supportsAnnouncements: (store) => store.supportsAnnouncements,
|
supportsAnnouncements: (store) => store.supportsAnnouncements,
|
||||||
}),
|
}),
|
||||||
...mapPiniaState(useInstanceStore, ['private', 'federating']),
|
...mapPiniaState(useInstanceStore, ['federating']),
|
||||||
...mapPiniaState(useInstanceStore, {
|
...mapPiniaState(useInstanceStore, {
|
||||||
|
privateMode: (store) => store.private,
|
||||||
pleromaChatMessagesAvailable: (store) =>
|
pleromaChatMessagesAvailable: (store) =>
|
||||||
store.featureSet.pleromaChatMessagesAvailable,
|
store.featureSet.pleromaChatMessagesAvailable,
|
||||||
bookmarkFolders: (store) =>
|
bookmarkFolders: (store) =>
|
||||||
|
|
|
||||||
|
|
@ -79,12 +79,6 @@ const SideDrawer = {
|
||||||
followRequestCount() {
|
followRequestCount() {
|
||||||
return this.$store.state.api.followRequests.length
|
return this.$store.state.api.followRequests.length
|
||||||
},
|
},
|
||||||
privateMode() {
|
|
||||||
return useInstanceStore().private
|
|
||||||
},
|
|
||||||
federating() {
|
|
||||||
return useInstanceStore().federating
|
|
||||||
},
|
|
||||||
timelinesRoute() {
|
timelinesRoute() {
|
||||||
let name
|
let name
|
||||||
if (useInterfaceStore().lastTimeline) {
|
if (useInterfaceStore().lastTimeline) {
|
||||||
|
|
|
||||||
|
|
@ -47,7 +47,7 @@
|
||||||
</router-link>
|
</router-link>
|
||||||
</li>
|
</li>
|
||||||
<li
|
<li
|
||||||
v-if="currentUser || !privateMode"
|
v-if="currentUser || !private"
|
||||||
@click="toggleDrawer"
|
@click="toggleDrawer"
|
||||||
>
|
>
|
||||||
<router-link
|
<router-link
|
||||||
|
|
@ -166,7 +166,7 @@
|
||||||
</ul>
|
</ul>
|
||||||
<ul>
|
<ul>
|
||||||
<li
|
<li
|
||||||
v-if="currentUser || !privateMode"
|
v-if="currentUser || !private"
|
||||||
@click="toggleDrawer"
|
@click="toggleDrawer"
|
||||||
>
|
>
|
||||||
<router-link
|
<router-link
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue