Skip to content

Commit cef6643

Browse files
committedJan 17, 2021
feat: частично работающая история переходов
1 parent fd2158b commit cef6643

File tree

7 files changed

+16
-7
lines changed

7 files changed

+16
-7
lines changed
 

Diff for: ‎src/components/auth/Auth.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
name="cancel"
55
color="var(--icon-gray)"
66
class="auth_cancel"
7-
@click="$router.go(-1)"
7+
@click="$router.back()"
88
/>
99

1010
<AuthForm v-if="!isConfirm" :onlyAddUser="onlyAddUser" @confirm="onConfirm" @auth="onAuth" />

Diff for: ‎src/components/auth/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ export async function loadUser(android_token, onlyAddUser) {
9797
store.commit('settings/setDefaultSettings', user.id);
9898

9999
if (onlyAddUser) {
100-
router.go(-1);
100+
router.back();
101101
} else {
102102
store.commit('users/setActiveUser', user.id);
103103
}

Diff for: ‎src/components/messages/Messages.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ export default {
4343
}
4444
4545
if (state.route.name === 'forward-to') {
46-
return router.replace(`/messages/${state.route.params.fromId}`);
46+
return router.push(`/messages/${state.route.params.fromId}`);
4747
}
4848
49-
router.replace('/messages');
49+
router.back();
5050
}
5151
5252
return {

Diff for: ‎src/components/messages/MessagesChat.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<div class="im_chat_container">
3-
<Header :peer_id="peer_id" :peer="peer" @close="$router.replace('/messages')" />
3+
<Header :peer_id="peer_id" :peer="peer" @close="$router.back()" />
44
<div class="im_chat_wrap">
55
<List :peer_id="peer_id" :peer="peer" />
66
<Input :peer_id="peer_id" :peer="peer" />

Diff for: ‎src/components/messages/MessagesPeer.vue

+3-1
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,9 @@ export default {
176176
});
177177
}
178178
179-
await router.replace({
179+
const updateMethod = state.route.name === 'chat' ? 'replace' : 'push';
180+
181+
await router[updateMethod]({
180182
name: 'chat',
181183
params: {
182184
id: peer_id,

Diff for: ‎src/components/messages/chat/attachments/Reply.vue

+7
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import { getPhotoFromSizes, eventBus } from 'js/utils';
2828
import { getMessagePreview, getPeerTitle, parseMessage } from 'js/messages';
2929
import vkapi from 'js/vkapi';
3030
import store from 'js/store';
31+
import router from 'js/router';
3132
3233
import VKText from '../../../UI/VKText.vue';
3334
@@ -101,6 +102,12 @@ export default {
101102
const messages = store.state.messages.messages[props.peer_id];
102103
103104
if (messages.find((msg) => msg.id === props.msg.id)) {
105+
const openedPeerId = router.currentRoute.value.params.id;
106+
107+
if (openedPeerId !== props.peer_id) {
108+
await router.push(`/messages/${props.peer_id}`);
109+
}
110+
104111
return jumpToMsg();
105112
}
106113

Diff for: ‎src/js/internalLinkResolver.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import store from './store';
44
import router from './router';
55

66
function openChat(peer_id) {
7-
router.replace(`/messages/${peer_id}`);
7+
router.push(`/messages/${peer_id}`);
88
return true;
99
}
1010

0 commit comments

Comments
 (0)
Please sign in to comment.