ZF/jitsi-meet
1
0
Fork 0
mirror of https://gitcode.com/GitHub_Trending/ji/jitsi-meet.git synced 2026-05-18 14:37:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

ref(user-interaction): do not store listener, move browser check to lib (#4441)

Browse Source 
* ref(user-interaction): remove storing of listener

* ref(user-interaction): move browser requirement check to lib-jitsi-meet

* ref(user-interaction): no inner function for listener, use module scope
This commit is contained in:
virtuacoplenny
2019-07-13 06:59:58 -07:00
committed by GitHub
parent 1993ad10eb
commit ada57ebcd0
6 changed files with 43 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
react/features/base/user-interaction/middleware.js
View File

@@ -3,10 +3,15 @@
import { APP_WILL_MOUNT, APP_WILL_UNMOUNT } from '../app';
import { MiddlewareRegistry } from '../redux';
import {
SET_USER_INTERACTION_LISTENER,
USER_INTERACTION_RECEIVED
} from './actionTypes';
import { USER_INTERACTION_RECEIVED } from './actionTypes';
/**
* Reference to any callback that has been created to be invoked on user
* interaction.
*
* @type {Function|null}
*/
let userInteractionListener = null;
/**
* Implements the entry point of the middleware of the feature base/user-interaction.
@@ -21,14 +26,31 @@ MiddlewareRegistry.register(store => next => action => {
break;
case APP_WILL_UNMOUNT:
case USER_INTERACTION_RECEIVED:
_stopListeningForUserInteraction(store);
_stopListeningForUserInteraction();
break;
}
return next(action);
});
/**
* Callback invoked when the user interacts with the page.
*
* @param {Function} dispatch - The redux dispatch function.
* @param {Object} event - The DOM event for a user interacting with the page.
* @private
* @returns {void}
*/
function _onUserInteractionReceived(dispatch, event) {
if (event.isTrusted) {
dispatch({
type: USER_INTERACTION_RECEIVED
});
_stopListeningForUserInteraction();
}
}
/**
* Registers listeners to notify redux of any user interaction with the page.
*
@@ -36,44 +58,24 @@ MiddlewareRegistry.register(store => next => action => {
* @private
* @returns {void}
*/
function _startListeningForUserInteraction(store) {
const userInteractionListener = event => {
if (event.isTrusted) {
store.dispatch({
type: USER_INTERACTION_RECEIVED
});
function _startListeningForUserInteraction({ dispatch }) {
_stopListeningForUserInteraction();
_stopListeningForUserInteraction(store);
}
};
userInteractionListener = _onUserInteractionReceived.bind(null, dispatch);
window.addEventListener('mousedown', userInteractionListener);
window.addEventListener('keydown', userInteractionListener);
store.dispatch({
type: SET_USER_INTERACTION_LISTENER,
userInteractionListener
});
}
/**
* Un-registers listeners intended to notify when the user has interacted with
* the page.
* De-registers listeners for user interaction with the page.
*
* @param {Object} store - The redux store.
* @private
* @returns {void}
*/
function _stopListeningForUserInteraction({ getState, dispatch }) {
const { userInteractionListener } = getState()['features/base/app'];
function _stopListeningForUserInteraction() {
window.removeEventListener('mousedown', userInteractionListener);
window.removeEventListener('keydown', userInteractionListener);
if (userInteractionListener) {
window.removeEventListener('mousedown', userInteractionListener);
window.removeEventListener('keydown', userInteractionListener);
dispatch({
type: SET_USER_INTERACTION_LISTENER,
userInteractionListener: undefined
});
}
userInteractionListener = null;
}