Browse Source

Name Redux actions consistently

Redux actions which represent "commands" should be imperative, and those
representing events should use the past tense.
master
Saúl Ibarra Corretgé 8 years ago
parent
commit
e71e6c5b79

+ 9
- 9
react/features/base/media/actionTypes.js View File

1
 import { Symbol } from '../react';
1
 import { Symbol } from '../react';
2
 
2
 
3
 /**
3
 /**
4
- * Action to change muted state of the local audio.
4
+ * Action to change the muted state of the local audio.
5
  *
5
  *
6
  * {
6
  * {
7
- *      type: AUDIO_MUTED_CHANGED,
7
+ *      type: SET_AUDIO_MUTED,
8
  *      muted: boolean
8
  *      muted: boolean
9
  * }
9
  * }
10
  */
10
  */
11
-export const AUDIO_MUTED_CHANGED = Symbol('AUDIO_MUTED_CHANGED');
11
+export const SET_AUDIO_MUTED = Symbol('SET_AUDIO_MUTED');
12
 
12
 
13
 /**
13
 /**
14
- * Action to signal a change of the facing mode of the local video camera.
14
+ * Action to change the facing mode of the local video camera.
15
  *
15
  *
16
  * {
16
  * {
17
- *      type: CAMERA_FACING_MODE_CHANGED,
17
+ *      type: SET_CAMERA_FACING_MODE,
18
  *      cameraFacingMode: CAMERA_FACING_MODE
18
  *      cameraFacingMode: CAMERA_FACING_MODE
19
  * }
19
  * }
20
  */
20
  */
21
-export const CAMERA_FACING_MODE_CHANGED = Symbol('CAMERA_FACING_MODE_CHANGED');
21
+export const SET_CAMERA_FACING_MODE = Symbol('SET_CAMERA_FACING_MODE');
22
 
22
 
23
 /**
23
 /**
24
- * Action to change muted state of the local video.
24
+ * Action to change the muted state of the local video.
25
  *
25
  *
26
  * {
26
  * {
27
- *      type: VIDEO_MUTED_CHANGED,
27
+ *      type: SET_VIDEO_MUTED,
28
  *      muted: boolean
28
  *      muted: boolean
29
  * }
29
  * }
30
  */
30
  */
31
-export const VIDEO_MUTED_CHANGED = Symbol('VIDEO_MUTED_CHANGED');
31
+export const SET_VIDEO_MUTED = Symbol('SET_VIDEO_MUTED');

+ 18
- 18
react/features/base/media/actions.js View File

1
 import {
1
 import {
2
-    AUDIO_MUTED_CHANGED,
3
-    CAMERA_FACING_MODE_CHANGED,
4
-    VIDEO_MUTED_CHANGED
2
+    SET_AUDIO_MUTED,
3
+    SET_CAMERA_FACING_MODE,
4
+    SET_VIDEO_MUTED
5
 } from './actionTypes';
5
 } from './actionTypes';
6
 import { CAMERA_FACING_MODE } from './constants';
6
 import { CAMERA_FACING_MODE } from './constants';
7
 import './middleware';
7
 import './middleware';
8
 import './reducer';
8
 import './reducer';
9
 
9
 
10
 /**
10
 /**
11
- * Action to signal the change in local audio muted state.
11
+ * Action to change the local audio muted state.
12
  *
12
  *
13
  * @param {boolean} muted - If local audio is muted.
13
  * @param {boolean} muted - If local audio is muted.
14
  * @returns {{
14
  * @returns {{
15
- *      type: AUDIO_MUTED_CHANGED,
15
+ *      type: SET_AUDIO_MUTED,
16
  *      muted: boolean
16
  *      muted: boolean
17
  *  }}
17
  *  }}
18
  */
18
  */
19
-export function audioMutedChanged(muted) {
19
+export function setAudioMuted(muted) {
20
     return {
20
     return {
21
-        type: AUDIO_MUTED_CHANGED,
21
+        type: SET_AUDIO_MUTED,
22
         muted
22
         muted
23
     };
23
     };
24
 }
24
 }
25
 
25
 
26
 /**
26
 /**
27
- * Action to signal the change in facing mode of local video camera.
27
+ * Action to change the facing mode of the local video camera.
28
  *
28
  *
29
  * @param {CAMERA_FACING_MODE} cameraFacingMode - Camera facing mode.
29
  * @param {CAMERA_FACING_MODE} cameraFacingMode - Camera facing mode.
30
  * @returns {{
30
  * @returns {{
31
- *      type: CAMERA_FACING_MODE_CHANGED,
31
+ *      type: SET_CAMERA_FACING_MODE,
32
  *      cameraFacingMode: CAMERA_FACING_MODE
32
  *      cameraFacingMode: CAMERA_FACING_MODE
33
  *  }}
33
  *  }}
34
  */
34
  */
35
-export function cameraFacingModeChanged(cameraFacingMode) {
35
+export function setCameraFacingMode(cameraFacingMode) {
36
     return {
36
     return {
37
-        type: CAMERA_FACING_MODE_CHANGED,
37
+        type: SET_CAMERA_FACING_MODE,
38
         cameraFacingMode
38
         cameraFacingMode
39
     };
39
     };
40
 }
40
 }
48
     return (dispatch, getState) => {
48
     return (dispatch, getState) => {
49
         const muted = getState()['features/base/media'].audio.muted;
49
         const muted = getState()['features/base/media'].audio.muted;
50
 
50
 
51
-        return dispatch(audioMutedChanged(!muted));
51
+        return dispatch(setAudioMuted(!muted));
52
     };
52
     };
53
 }
53
 }
54
 
54
 
67
                 ? CAMERA_FACING_MODE.ENVIRONMENT
67
                 ? CAMERA_FACING_MODE.ENVIRONMENT
68
                 : CAMERA_FACING_MODE.USER;
68
                 : CAMERA_FACING_MODE.USER;
69
 
69
 
70
-        return dispatch(cameraFacingModeChanged(cameraFacingMode));
70
+        return dispatch(setCameraFacingMode(cameraFacingMode));
71
     };
71
     };
72
 }
72
 }
73
 
73
 
80
     return (dispatch, getState) => {
80
     return (dispatch, getState) => {
81
         const muted = getState()['features/base/media'].video.muted;
81
         const muted = getState()['features/base/media'].video.muted;
82
 
82
 
83
-        return dispatch(videoMutedChanged(!muted));
83
+        return dispatch(setVideoMuted(!muted));
84
     };
84
     };
85
 }
85
 }
86
 
86
 
87
 /**
87
 /**
88
- * Action to signal the change in local video muted state.
88
+ * Action to change the local video muted state.
89
  *
89
  *
90
  * @param {boolean} muted - If local video is muted.
90
  * @param {boolean} muted - If local video is muted.
91
  * @returns {{
91
  * @returns {{
92
- *      type: VIDEO_MUTED_CHANGED,
92
+ *      type: SET_VIDEO_MUTED,
93
  *      muted: boolean
93
  *      muted: boolean
94
  *  }}
94
  *  }}
95
  */
95
  */
96
-export function videoMutedChanged(muted) {
96
+export function setVideoMuted(muted) {
97
     return {
97
     return {
98
-        type: VIDEO_MUTED_CHANGED,
98
+        type: SET_VIDEO_MUTED,
99
         muted
99
         muted
100
     };
100
     };
101
 }
101
 }

+ 6
- 6
react/features/base/media/middleware.js View File

3
 import { setTrackMuted, TRACK_ADDED } from '../tracks';
3
 import { setTrackMuted, TRACK_ADDED } from '../tracks';
4
 
4
 
5
 import {
5
 import {
6
-    audioMutedChanged,
7
-    cameraFacingModeChanged,
8
-    videoMutedChanged
6
+    setAudioMuted,
7
+    setCameraFacingMode,
8
+    setVideoMuted
9
 } from './actions';
9
 } from './actions';
10
 import { CAMERA_FACING_MODE } from './constants';
10
 import { CAMERA_FACING_MODE } from './constants';
11
 
11
 
42
     const { dispatch, getState } = store;
42
     const { dispatch, getState } = store;
43
     const state = getState()['features/base/media'];
43
     const state = getState()['features/base/media'];
44
 
44
 
45
-    state.audio.muted && dispatch(audioMutedChanged(false));
45
+    state.audio.muted && dispatch(setAudioMuted(false));
46
     (state.video.facingMode !== CAMERA_FACING_MODE.USER)
46
     (state.video.facingMode !== CAMERA_FACING_MODE.USER)
47
-        && dispatch(cameraFacingModeChanged(CAMERA_FACING_MODE.USER));
48
-    state.video.muted && dispatch(videoMutedChanged(false));
47
+        && dispatch(setCameraFacingMode(CAMERA_FACING_MODE.USER));
48
+    state.video.muted && dispatch(setVideoMuted(false));
49
 }
49
 }
50
 
50
 
51
 /**
51
 /**

+ 6
- 6
react/features/base/media/reducer.js View File

3
 import { ReducerRegistry } from '../redux';
3
 import { ReducerRegistry } from '../redux';
4
 
4
 
5
 import {
5
 import {
6
-    AUDIO_MUTED_CHANGED,
7
-    CAMERA_FACING_MODE_CHANGED,
8
-    VIDEO_MUTED_CHANGED
6
+    SET_AUDIO_MUTED,
7
+    SET_CAMERA_FACING_MODE,
8
+    SET_VIDEO_MUTED
9
 } from './actionTypes';
9
 } from './actionTypes';
10
 import { CAMERA_FACING_MODE } from './constants';
10
 import { CAMERA_FACING_MODE } from './constants';
11
 
11
 
35
  */
35
  */
36
 function audio(state = AUDIO_INITIAL_MEDIA_STATE, action) {
36
 function audio(state = AUDIO_INITIAL_MEDIA_STATE, action) {
37
     switch (action.type) {
37
     switch (action.type) {
38
-    case AUDIO_MUTED_CHANGED:
38
+    case SET_AUDIO_MUTED:
39
         return {
39
         return {
40
             ...state,
40
             ...state,
41
             muted: action.muted
41
             muted: action.muted
74
  */
74
  */
75
 function video(state = VIDEO_INITIAL_MEDIA_STATE, action) {
75
 function video(state = VIDEO_INITIAL_MEDIA_STATE, action) {
76
     switch (action.type) {
76
     switch (action.type) {
77
-    case CAMERA_FACING_MODE_CHANGED:
77
+    case SET_CAMERA_FACING_MODE:
78
         return {
78
         return {
79
             ...state,
79
             ...state,
80
             facingMode: action.cameraFacingMode
80
             facingMode: action.cameraFacingMode
81
         };
81
         };
82
 
82
 
83
-    case VIDEO_MUTED_CHANGED:
83
+    case SET_VIDEO_MUTED:
84
         return {
84
         return {
85
             ...state,
85
             ...state,
86
             muted: action.muted
86
             muted: action.muted

+ 13
- 13
react/features/base/tracks/middleware.js View File

3
     LIB_INITIALIZED
3
     LIB_INITIALIZED
4
 } from '../lib-jitsi-meet';
4
 } from '../lib-jitsi-meet';
5
 import {
5
 import {
6
-    AUDIO_MUTED_CHANGED,
7
-    audioMutedChanged,
8
-    CAMERA_FACING_MODE_CHANGED,
9
     MEDIA_TYPE,
6
     MEDIA_TYPE,
10
-    VIDEO_MUTED_CHANGED,
11
-    videoMutedChanged
7
+    SET_AUDIO_MUTED,
8
+    SET_CAMERA_FACING_MODE,
9
+    SET_VIDEO_MUTED,
10
+    setAudioMuted,
11
+    setVideoMuted
12
 } from '../media';
12
 } from '../media';
13
 import { MiddlewareRegistry } from '../redux';
13
 import { MiddlewareRegistry } from '../redux';
14
 
14
 
32
  */
32
  */
33
 MiddlewareRegistry.register(store => next => action => {
33
 MiddlewareRegistry.register(store => next => action => {
34
     switch (action.type) {
34
     switch (action.type) {
35
-    case AUDIO_MUTED_CHANGED:
36
-        _mutedChanged(store, action, MEDIA_TYPE.AUDIO);
35
+    case SET_AUDIO_MUTED:
36
+        _setMuted(store, action, MEDIA_TYPE.AUDIO);
37
         break;
37
         break;
38
 
38
 
39
-    case CAMERA_FACING_MODE_CHANGED:
39
+    case SET_CAMERA_FACING_MODE:
40
         store.dispatch(
40
         store.dispatch(
41
             createLocalTracks({
41
             createLocalTracks({
42
                 devices: [ MEDIA_TYPE.VIDEO ],
42
                 devices: [ MEDIA_TYPE.VIDEO ],
56
     case TRACK_UPDATED:
56
     case TRACK_UPDATED:
57
         return _trackUpdated(store, next, action);
57
         return _trackUpdated(store, next, action);
58
 
58
 
59
-    case VIDEO_MUTED_CHANGED:
60
-        _mutedChanged(store, action, MEDIA_TYPE.VIDEO);
59
+    case SET_VIDEO_MUTED:
60
+        _setMuted(store, action, MEDIA_TYPE.VIDEO);
61
         break;
61
         break;
62
     }
62
     }
63
 
63
 
91
  * @private
91
  * @private
92
  * @returns {void}
92
  * @returns {void}
93
  */
93
  */
94
-function _mutedChanged(store, action, mediaType) {
94
+function _setMuted(store, action, mediaType) {
95
     const localTrack = _getLocalTrack(store, mediaType);
95
     const localTrack = _getLocalTrack(store, mediaType);
96
 
96
 
97
     localTrack && setTrackMuted(localTrack.jitsiTrack, action.muted);
97
     localTrack && setTrackMuted(localTrack.jitsiTrack, action.muted);
145
             if (oldMuted !== newMuted) {
145
             if (oldMuted !== newMuted) {
146
                 switch (mediaType) {
146
                 switch (mediaType) {
147
                 case MEDIA_TYPE.AUDIO:
147
                 case MEDIA_TYPE.AUDIO:
148
-                    store.dispatch(audioMutedChanged(newMuted));
148
+                    store.dispatch(setAudioMuted(newMuted));
149
                     break;
149
                     break;
150
                 case MEDIA_TYPE.VIDEO:
150
                 case MEDIA_TYPE.VIDEO:
151
-                    store.dispatch(videoMutedChanged(newMuted));
151
+                    store.dispatch(setVideoMuted(newMuted));
152
                     break;
152
                     break;
153
                 }
153
                 }
154
             }
154
             }

+ 4
- 4
react/features/largeVideo/actionTypes.js View File

1
 import { Symbol } from '../base/react';
1
 import { Symbol } from '../base/react';
2
 
2
 
3
 /**
3
 /**
4
- * Action to change the participant to be displayed in LargeVideo.
4
+ * Action to select the participant to be displayed in LargeVideo.
5
  *
5
  *
6
  * {
6
  * {
7
- *     type: LARGE_VIDEO_PARTICIPANT_CHANGED,
7
+ *     type: SELECT_LARGE_VIDEO_PARTICIPANT,
8
  *     participantId: (string|undefined)
8
  *     participantId: (string|undefined)
9
  * }
9
  * }
10
  */
10
  */
11
-export const LARGE_VIDEO_PARTICIPANT_CHANGED
12
-    = Symbol('LARGE_VIDEO_PARTICIPANT_CHANGED');
11
+export const SELECT_LARGE_VIDEO_PARTICIPANT
12
+    = Symbol('SELECT_LARGE_VIDEO_PARTICIPANT');

+ 2
- 2
react/features/largeVideo/actions.js View File

8
     getTrackByMediaTypeAndParticipant
8
     getTrackByMediaTypeAndParticipant
9
 } from '../base/tracks';
9
 } from '../base/tracks';
10
 
10
 
11
-import { LARGE_VIDEO_PARTICIPANT_CHANGED } from './actionTypes';
11
+import { SELECT_LARGE_VIDEO_PARTICIPANT } from './actionTypes';
12
 import './middleware';
12
 import './middleware';
13
 import './reducer';
13
 import './reducer';
14
 
14
 
60
 
60
 
61
         if (participantId !== largeVideo.participantId) {
61
         if (participantId !== largeVideo.participantId) {
62
             dispatch({
62
             dispatch({
63
-                type: LARGE_VIDEO_PARTICIPANT_CHANGED,
63
+                type: SELECT_LARGE_VIDEO_PARTICIPANT,
64
                 participantId
64
                 participantId
65
             });
65
             });
66
 
66
 

+ 2
- 2
react/features/largeVideo/reducer.js View File

1
 import { PARTICIPANT_ID_CHANGED } from '../base/participants';
1
 import { PARTICIPANT_ID_CHANGED } from '../base/participants';
2
 import { ReducerRegistry } from '../base/redux';
2
 import { ReducerRegistry } from '../base/redux';
3
 
3
 
4
-import { LARGE_VIDEO_PARTICIPANT_CHANGED } from './actionTypes';
4
+import { SELECT_LARGE_VIDEO_PARTICIPANT } from './actionTypes';
5
 
5
 
6
 ReducerRegistry.register('features/largeVideo', (state = {}, action) => {
6
 ReducerRegistry.register('features/largeVideo', (state = {}, action) => {
7
     switch (action.type) {
7
     switch (action.type) {
20
         }
20
         }
21
         break;
21
         break;
22
 
22
 
23
-    case LARGE_VIDEO_PARTICIPANT_CHANGED:
23
+    case SELECT_LARGE_VIDEO_PARTICIPANT:
24
         return {
24
         return {
25
             ...state,
25
             ...state,
26
             participantId: action.participantId
26
             participantId: action.participantId

Loading…
Cancel
Save