浏览代码

Name folders consistently

j8
Lyubomir Marinov 8 年前
父节点
当前提交
eaed9db1e7
共有 26 个文件被更改,包括 27 次插入33 次删除
  1. 0
    0
      react/features/base/font-icons/Icon.js
  2. 0
    0
      react/features/base/font-icons/index.js
  3. 0
    0
      react/features/base/font-icons/jitsi.json
  4. 15
    15
      react/features/base/media/reducer.js
  5. 2
    2
      react/features/conference/components/Conference.native.js
  6. 0
    0
      react/features/film-strip/components/FilmStrip.js
  7. 4
    10
      react/features/film-strip/components/Thumbnail.js
  8. 0
    0
      react/features/film-strip/components/_.native.js
  9. 0
    0
      react/features/film-strip/components/index.js
  10. 0
    0
      react/features/film-strip/components/native/AudioMutedIndicator.js
  11. 0
    0
      react/features/film-strip/components/native/DominantSpeakerIndicator.js
  12. 0
    0
      react/features/film-strip/components/native/ModeratorIndicator.js
  13. 0
    0
      react/features/film-strip/components/native/VideoMutedIndicator.js
  14. 0
    0
      react/features/film-strip/components/native/index.js
  15. 0
    0
      react/features/film-strip/components/native/styles.js
  16. 0
    0
      react/features/film-strip/components/styles.js
  17. 0
    0
      react/features/film-strip/index.js
  18. 0
    0
      react/features/large-video/actionTypes.js
  19. 2
    2
      react/features/large-video/actions.js
  20. 1
    1
      react/features/large-video/components/LargeVideo.js
  21. 0
    0
      react/features/large-video/components/index.js
  22. 0
    0
      react/features/large-video/components/styles.js
  23. 0
    0
      react/features/large-video/index.js
  24. 1
    1
      react/features/large-video/middleware.js
  25. 1
    1
      react/features/large-video/reducer.js
  26. 1
    1
      react/features/toolbar/components/ToolbarButton.native.js

react/features/base/fontIcons/Icon.js → react/features/base/font-icons/Icon.js 查看文件


react/features/base/fontIcons/index.js → react/features/base/font-icons/index.js 查看文件


react/features/base/fontIcons/jitsi.json → react/features/base/font-icons/jitsi.json 查看文件


+ 15
- 15
react/features/base/media/reducer.js 查看文件

9
 } from './actionTypes';
9
 } from './actionTypes';
10
 import { CAMERA_FACING_MODE } from './constants';
10
 import { CAMERA_FACING_MODE } from './constants';
11
 
11
 
12
-/**
13
- * Listen for various actions related to media devices.
14
- *
15
- * @param {Object} state - State of media devices.
16
- * @param {Object} action - Action object.
17
- * @param {string} action.type - Type of action.
18
- * @param {Object} action.media - Information about media devices to be
19
- * modified.
20
- * @returns {Object}
21
- */
22
-ReducerRegistry.register('features/base/media', combineReducers({
23
-    audio,
24
-    video
25
-}));
26
-
27
 /**
12
 /**
28
  * Media state object for local audio.
13
  * Media state object for local audio.
29
  *
14
  *
105
         return state;
90
         return state;
106
     }
91
     }
107
 }
92
 }
93
+
94
+/**
95
+ * Listen for various actions related to media devices.
96
+ *
97
+ * @param {Object} state - State of media devices.
98
+ * @param {Object} action - Action object.
99
+ * @param {string} action.type - Type of action.
100
+ * @param {Object} action.media - Information about media devices to be
101
+ * modified.
102
+ * @returns {Object}
103
+ */
104
+ReducerRegistry.register('features/base/media', combineReducers({
105
+    audio,
106
+    video
107
+}));

+ 2
- 2
react/features/conference/components/Conference.native.js 查看文件

3
 
3
 
4
 import { connect, disconnect } from '../../base/connection';
4
 import { connect, disconnect } from '../../base/connection';
5
 import { Container } from '../../base/react';
5
 import { Container } from '../../base/react';
6
-import { FilmStrip } from '../../filmStrip';
7
-import { LargeVideo } from '../../largeVideo';
6
+import { FilmStrip } from '../../film-strip';
7
+import { LargeVideo } from '../../large-video';
8
 import { RoomLockPrompt } from '../../room-lock';
8
 import { RoomLockPrompt } from '../../room-lock';
9
 import { Toolbar } from '../../toolbar';
9
 import { Toolbar } from '../../toolbar';
10
 
10
 

react/features/filmStrip/components/FilmStrip.js → react/features/film-strip/components/FilmStrip.js 查看文件


react/features/filmStrip/components/Thumbnail.js → react/features/film-strip/components/Thumbnail.js 查看文件

1
 import React, { Component } from 'react';
1
 import React, { Component } from 'react';
2
 import { connect } from 'react-redux';
2
 import { connect } from 'react-redux';
3
 
3
 
4
-import {
5
-    Audio,
6
-    MEDIA_TYPE
7
-} from '../../base/media';
8
-import {
9
-    PARTICIPANT_ROLE,
10
-    pinParticipant
11
-} from '../../base/participants';
4
+import { Audio, MEDIA_TYPE } from '../../base/media';
5
+import { PARTICIPANT_ROLE, pinParticipant } from '../../base/participants';
12
 import { Container } from '../../base/react';
6
 import { Container } from '../../base/react';
13
 import { getTrackByMediaTypeAndParticipant } from '../../base/tracks';
7
 import { getTrackByMediaTypeAndParticipant } from '../../base/tracks';
14
 import { ParticipantView } from '../../conference';
8
 import { ParticipantView } from '../../conference';
148
  *  }}
142
  *  }}
149
  */
143
  */
150
 function mapStateToProps(state, ownProps) {
144
 function mapStateToProps(state, ownProps) {
151
-    // We need read-only access to the state of features/largeVideo so that the
145
+    // We need read-only access to the state of features/large-video so that the
152
     // film strip doesn't render the video of the participant who is rendered on
146
     // film strip doesn't render the video of the participant who is rendered on
153
     // the stage i.e. as a large video.
147
     // the stage i.e. as a large video.
154
-    const largeVideo = state['features/largeVideo'];
148
+    const largeVideo = state['features/large-video'];
155
     const tracks = state['features/base/tracks'];
149
     const tracks = state['features/base/tracks'];
156
     const id = ownProps.participant.id;
150
     const id = ownProps.participant.id;
157
     const audioTrack
151
     const audioTrack

react/features/filmStrip/components/_.native.js → react/features/film-strip/components/_.native.js 查看文件


react/features/filmStrip/components/index.js → react/features/film-strip/components/index.js 查看文件


react/features/filmStrip/components/native/AudioMutedIndicator.js → react/features/film-strip/components/native/AudioMutedIndicator.js 查看文件


react/features/filmStrip/components/native/DominantSpeakerIndicator.js → react/features/film-strip/components/native/DominantSpeakerIndicator.js 查看文件


react/features/filmStrip/components/native/ModeratorIndicator.js → react/features/film-strip/components/native/ModeratorIndicator.js 查看文件


react/features/filmStrip/components/native/VideoMutedIndicator.js → react/features/film-strip/components/native/VideoMutedIndicator.js 查看文件


react/features/filmStrip/components/native/index.js → react/features/film-strip/components/native/index.js 查看文件


react/features/filmStrip/components/native/styles.js → react/features/film-strip/components/native/styles.js 查看文件


react/features/filmStrip/components/styles.js → react/features/film-strip/components/styles.js 查看文件


react/features/filmStrip/index.js → react/features/film-strip/index.js 查看文件


react/features/largeVideo/actionTypes.js → react/features/large-video/actionTypes.js 查看文件


react/features/largeVideo/actions.js → react/features/large-video/actions.js 查看文件

20
         const conference = state['features/base/conference'].conference;
20
         const conference = state['features/base/conference'].conference;
21
 
21
 
22
         if (conference) {
22
         if (conference) {
23
-            const largeVideo = state['features/largeVideo'];
23
+            const largeVideo = state['features/large-video'];
24
             const tracks = state['features/base/tracks'];
24
             const tracks = state['features/base/tracks'];
25
 
25
 
26
             const id = largeVideo.participantId;
26
             const id = largeVideo.participantId;
53
     return (dispatch, getState) => {
53
     return (dispatch, getState) => {
54
         const state = getState();
54
         const state = getState();
55
         const participantId = _electParticipantInLargeVideo(state);
55
         const participantId = _electParticipantInLargeVideo(state);
56
-        const largeVideo = state['features/largeVideo'];
56
+        const largeVideo = state['features/large-video'];
57
 
57
 
58
         if (participantId !== largeVideo.participantId) {
58
         if (participantId !== largeVideo.participantId) {
59
             dispatch({
59
             dispatch({

react/features/largeVideo/components/LargeVideo.js → react/features/large-video/components/LargeVideo.js 查看文件

52
  */
52
  */
53
 function mapStateToProps(state) {
53
 function mapStateToProps(state) {
54
     return {
54
     return {
55
-        _participantId: state['features/largeVideo'].participantId
55
+        _participantId: state['features/large-video'].participantId
56
     };
56
     };
57
 }
57
 }
58
 
58
 

react/features/largeVideo/components/index.js → react/features/large-video/components/index.js 查看文件


react/features/largeVideo/components/styles.js → react/features/large-video/components/styles.js 查看文件


react/features/largeVideo/index.js → react/features/large-video/index.js 查看文件


react/features/largeVideo/middleware.js → react/features/large-video/middleware.js 查看文件

47
                 = getTrackByJitsiTrack(
47
                 = getTrackByJitsiTrack(
48
                     state['features/base/tracks'],
48
                     state['features/base/tracks'],
49
                     action.track.jitsiTrack);
49
                     action.track.jitsiTrack);
50
-            const participantId = state['features/largeVideo'].participantId;
50
+            const participantId = state['features/large-video'].participantId;
51
 
51
 
52
             (track.participantId === participantId)
52
             (track.participantId === participantId)
53
                 && store.dispatch(selectParticipant());
53
                 && store.dispatch(selectParticipant());

react/features/largeVideo/reducer.js → react/features/large-video/reducer.js 查看文件

3
 
3
 
4
 import { SELECT_LARGE_VIDEO_PARTICIPANT } from './actionTypes';
4
 import { SELECT_LARGE_VIDEO_PARTICIPANT } from './actionTypes';
5
 
5
 
6
-ReducerRegistry.register('features/largeVideo', (state = {}, action) => {
6
+ReducerRegistry.register('features/large-video', (state = {}, action) => {
7
     switch (action.type) {
7
     switch (action.type) {
8
 
8
 
9
     // When conference is joined, we update ID of local participant from default
9
     // When conference is joined, we update ID of local participant from default

+ 1
- 1
react/features/toolbar/components/ToolbarButton.native.js 查看文件

1
 import React from 'react';
1
 import React from 'react';
2
 import { TouchableHighlight } from 'react-native';
2
 import { TouchableHighlight } from 'react-native';
3
 
3
 
4
-import { Icon } from '../../base/fontIcons';
4
+import { Icon } from '../../base/font-icons';
5
 
5
 
6
 import AbstractToolbarButton from './AbstractToolbarButton';
6
 import AbstractToolbarButton from './AbstractToolbarButton';
7
 
7
 

正在加载...
取消
保存