summaryrefslogtreecommitdiff
path: root/src/client/ui
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2020-11-03 10:06:19 +0900
committersyuilo <syuilotan@yahoo.co.jp>2020-11-03 10:06:19 +0900
commit7a5a541a4ed2ecd607b9e4545bcd192bcf381f17 (patch)
treeb186afa14867656555bc85d3c8ed19a327153bf6 /src/client/ui
parent12.52.0 (diff)
downloadmisskey-7a5a541a4ed2ecd607b9e4545bcd192bcf381f17.tar.gz
misskey-7a5a541a4ed2ecd607b9e4545bcd192bcf381f17.tar.bz2
misskey-7a5a541a4ed2ecd607b9e4545bcd192bcf381f17.zip
相対パスでコピーされるのを修正
Diffstat (limited to 'src/client/ui')
-rw-r--r--src/client/ui/default.side.vue29
-rw-r--r--src/client/ui/default.vue8
2 files changed, 22 insertions, 15 deletions
diff --git a/src/client/ui/default.side.vue b/src/client/ui/default.side.vue
index cff35f6ed3..73f6cb92f4 100644
--- a/src/client/ui/default.side.vue
+++ b/src/client/ui/default.side.vue
@@ -19,6 +19,7 @@ import XHeader from './_common_/header.vue';
import * as os from '@/os';
import copyToClipboard from '@/scripts/copy-to-clipboard';
import { resolve } from '@/router';
+import { url } from '@/config';
export default defineComponent({
components: {
@@ -27,15 +28,15 @@ export default defineComponent({
provide() {
return {
- navHook: (url) => {
- this.navigate(url);
+ navHook: (path) => {
+ this.navigate(path);
}
};
},
data() {
return {
- url: null,
+ path: null,
component: null,
props: {},
pageInfo: null,
@@ -44,6 +45,12 @@ export default defineComponent({
};
},
+ computed: {
+ url(): string {
+ return url + this.path;
+ }
+ },
+
methods: {
changePage(page) {
if (page == null) return;
@@ -52,10 +59,10 @@ export default defineComponent({
}
},
- navigate(url, record = true) {
- if (record && this.url) this.history.push(this.url);
- this.url = url;
- const { component, props } = resolve(url);
+ navigate(path, record = true) {
+ if (record && this.path) this.history.push(this.path);
+ this.path = path;
+ const { component, props } = resolve(path);
this.component = component;
this.props = props;
},
@@ -65,7 +72,7 @@ export default defineComponent({
},
close() {
- this.url = null;
+ this.path = null;
this.component = null;
this.props = {};
},
@@ -73,19 +80,19 @@ export default defineComponent({
onContextmenu(e) {
os.contextMenu([{
type: 'label',
- text: this.url,
+ text: this.path,
}, {
icon: faExpandAlt,
text: this.$t('showInPage'),
action: () => {
- this.$router.push(this.url);
+ this.$router.push(this.path);
this.close();
}
}, {
icon: faWindowMaximize,
text: this.$t('openInWindow'),
action: () => {
- os.pageWindow(this.url);
+ os.pageWindow(this.path);
this.close();
}
}, null, {
diff --git a/src/client/ui/default.vue b/src/client/ui/default.vue
index 7127d8f12c..626e5242c5 100644
--- a/src/client/ui/default.vue
+++ b/src/client/ui/default.vue
@@ -216,21 +216,21 @@ export default defineComponent({
},
onContextmenu(e) {
- const url = this.$route.path;
+ const path = this.$route.path;
os.contextMenu([{
type: 'label',
- text: url,
+ text: path,
}, {
icon: faColumns,
text: this.$t('openInSideView'),
action: () => {
- this.$refs.side.navigate(url);
+ this.$refs.side.navigate(path);
}
}, {
icon: faWindowMaximize,
text: this.$t('openInWindow'),
action: () => {
- os.pageWindow(url);
+ os.pageWindow(path);
}
}], e);
},