diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-07-06 20:43:38 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-07-06 20:43:38 +0000 |
| commit | 8f5379642029f730aa3d905c6980433c6c901486 (patch) | |
| tree | 2888a000a85d77c221a61bac44e2b246b2f068ff /src/modules/statuses.js | |
| parent | 8d6750d9c2816e33a0444cd978f94009d8b85d47 (diff) | |
| parent | 60b413d02c4be5b3f24ff984e43090620d9a59e1 (diff) | |
Merge branch 'develop' into 'eslint-fix'
# Conflicts:
# src/components/post_status_form/post_status_form.vue
Diffstat (limited to 'src/modules/statuses.js')
| -rw-r--r-- | src/modules/statuses.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/modules/statuses.js b/src/modules/statuses.js index e00293c1..cf65c9f4 100644 --- a/src/modules/statuses.js +++ b/src/modules/statuses.js @@ -395,8 +395,9 @@ export const mutations = { state[key] = value }) }, - clearTimeline (state, { timeline }) { - state.timelines[timeline] = emptyTl(state.timelines[timeline].userId) + clearTimeline (state, { timeline, excludeUserId = false }) { + const userId = excludeUserId ? state.timelines[timeline].userId : undefined + state.timelines[timeline] = emptyTl(userId) }, clearNotifications (state) { state.notifications = emptyNotifications() |