sendnrw/misskey
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'migrate-accounts-to-idb' into sw-notification-action

Browse Source
This commit is contained in:
tamaina
2021-07-19 15:53:49 +09:00
parent 9b30eabd15 5926a4098b
commit e436d2e47d
33 changed files with 500 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/client/ui/_common_/sidebar.vue
View File

@@ -49,7 +49,7 @@ import { defineComponent } from 'vue';
import { host } from '@client/config';
import { search } from '@client/scripts/search';
import * as os from '@client/os';
import { sidebarDef } from '@client/sidebar';
import { menuDef } from '@client/menu';
import { getAccounts, addAccount, login } from '@client/account';
export default defineComponent({
@@ -67,7 +67,7 @@ export default defineComponent({
showing: false,
accounts: [],
connection: null,
menuDef: sidebarDef,
menuDef: menuDef,
iconOnly: false,
hidden: this.defaultHidden,
};
@@ -92,7 +92,7 @@ export default defineComponent({
this.showing = false;
},
'$store.reactiveState.sidebarDisplay.value'() {
'$store.reactiveState.menuDisplay.value'() {
this.calcViewState();
},
@@ -116,7 +116,7 @@ export default defineComponent({
methods: {
calcViewState() {
this.iconOnly = (window.innerWidth <= 1279) || (this.$store.state.sidebarDisplay === 'icon');
this.iconOnly = (window.innerWidth <= 1279) || (this.$store.state.menuDisplay === 'sideIcon');
if (!this.defaultHidden) {
this.hidden = (window.innerWidth <= 650);
}