Skip to content

Don't remember grid mode in sidebar call #4573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
PVince81 wants to merge 1 commit into from
Closed

Don't remember grid mode in sidebar call #4573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/components/CallView/CallView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,11 @@ export default {
},
},
watch: {
isSidebar: (isSidebar) => {
// update matching store value
this.$store.dispatch('isSidebar', isSidebar)
},

localScreen: function(localScreen) {
this._setScreenAvailable(localCallParticipantModel.attributes.peerId, localScreen)
},
Expand Down Expand Up @@ -360,6 +365,9 @@ export default {
// subviews.
this.updateDataFromCallParticipantModels(this.callParticipantModels)
},
mounted() {
this.$store.dispatch('isSidebar', this.isSidebar)
},
methods: {
/**
* Updates data properties that depend on the CallParticipantModels.
Expand Down
17 changes: 16 additions & 1 deletion src/store/callViewStore.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import {

const state = {
isGrid: false,
isSidebar: false,
selectedVideoPeerId: null,
videoBackgroundBlur: 1,
}
Expand All @@ -35,6 +36,9 @@ const getters = {
isGrid: (state) => {
return state.isGrid
},
isSidebar: (state) => {
return state.isSidebar
},
selectedVideoPeerId: (state) => {
return state.selectedVideoPeerId
},
Expand All @@ -48,6 +52,9 @@ const mutations = {
isGrid(state, value) {
state.isGrid = value
},
isSidebar(state, value) {
state.isSidebar = value
},
selectedVideoPeerId(state, value) {
state.selectedVideoPeerId = value
},
Expand All @@ -61,14 +68,22 @@ const actions = {
* @param {bool} value true for enabled grid mode, false for speaker view;
*/
isGrid(context, value) {
BrowserStorage.setItem('callprefs-' + context.getters.getToken() + '-isgrid', value)
if (!context.getters.isSidebar()) {
BrowserStorage.setItem('callprefs-' + context.getters.getToken() + '-isgrid', value)
}
context.commit('isGrid', value)
},
isSidebar(context, value) {
context.commit('isSidebar', value)
},
selectedVideoPeerId(context, value) {
context.commit('selectedVideoPeerId', value)
},

joinCall(context, { token }) {
if (context.getters.isSidebar()) {
context.dispatch('isGrid', false)
}
let isGrid = BrowserStorage.getItem('callprefs-' + token + '-isgrid')
if (isGrid === null) {
const conversationType = context.getters.conversations[token].type
Expand Down