Skip to content
Snippets Groups Projects
Commit 3c65e7b7 authored by syuilo's avatar syuilo
Browse files

fix deck navigation

parent 3fc427b6
No related branches found
No related tags found
No related merge requests found
......@@ -10,7 +10,7 @@ import { faExpandAlt, faColumns, faExternalLinkAlt, faLink, faWindowMaximize } f
import * as os from '@/os';
import copyToClipboard from '@/scripts/copy-to-clipboard';
import { router } from '@/router';
import { ui, url } from '@/config';
import { url } from '@/config';
import { popout } from '@/scripts/popout';
import { ColdDeviceStorage } from '@/store';
......@@ -115,13 +115,6 @@ export default defineComponent({
if (this.$store.state.defaultSideView && this.sideViewHook && this.to !== '/') {
return this.sideViewHook(this.to);
}
// TODO: a.vueからdeck-sotreを参照したくないのでなんとかする
//if (deckStore.state.device.deckNavWindow && (ui === 'deck') && this.to !== '/') {
// return this.window();
//}
if (ui === 'desktop') {
return this.window();
}
if (this.$router.currentRoute.value.path === this.to) {
window.scroll({ top: 0, behavior: 'smooth' });
......
......@@ -50,6 +50,14 @@ export default defineComponent({
DeckColumnCore,
},
provide() {
return deckStore.state.navWindow ? {
navHook: (url) => {
os.pageWindow(url);
}
} : {};
},
data() {
return {
deckStore,
......
......@@ -22,6 +22,14 @@ export default defineComponent({
XSidebar
},
provide() {
return {
navHook: (url) => {
os.pageWindow(url);
}
};
},
data() {
return {
host: host,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment