haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(tile-view): disable on etherpad display, disable etherpad on view enter

This commit is contained in:
Leonard Kim 2018-11-28 11:48:15 -08:00
parent 29bc18df01
commit 1396d59ce2
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
react/features/video-layout/middleware.any.js
View File

@ -4,6 +4,7 @@ import {
pinParticipant pinParticipant
} from '../base/participants'; } from '../base/participants';
import { MiddlewareRegistry } from '../base/redux'; import { MiddlewareRegistry } from '../base/redux';
import { SET_DOCUMENT_EDITING_STATUS, toggleDocument } from '../etherpad';
import { SET_TILE_VIEW } from './actionTypes'; import { SET_TILE_VIEW } from './actionTypes';
import { setTileView } from './actions'; import { setTileView } from './actions';
@ -27,13 +28,29 @@ MiddlewareRegistry.register(store => next => action => {
break; break;
} }
case SET_TILE_VIEW: case SET_DOCUMENT_EDITING_STATUS:
if (getPinnedParticipant(store.getState()) && action.enabled) { if (action.editing) {
store.dispatch(pinParticipant(null)); store.dispatch(setTileView(false));
}
break;
case SET_TILE_VIEW: {
const state = store.getState();
if (action.enabled) {
if (getPinnedParticipant(state)) {
store.dispatch(pinParticipant(null));
}
if (state['features/etherpad'].editing) {
store.dispatch(toggleDocument());
}
} }
break; break;
} }
}
return next(action); return next(action);
}); });