瀏覽代碼

feat(errors): fix error handling for connection and conference

master
Lyubo Marinov 7 年之前
父節點
當前提交
0eafee2a95
共有 2 個文件被更改,包括 6 次插入3 次删除
  1. 2
    1
      react/features/base/conference/reducer.js
  2. 4
    2
      react/features/base/connection/reducer.js

+ 2
- 1
react/features/base/conference/reducer.js 查看文件

82
  * reduction of the specified action.
82
  * reduction of the specified action.
83
  */
83
  */
84
 function _conferenceFailed(state, { conference, error }) {
84
 function _conferenceFailed(state, { conference, error }) {
85
-    // The active conference or the one we are joining.
85
+    // The current (similar to getCurrentConference in
86
+    // base/conference/functions.js) conference which is joining or joined:
86
     const conference_ = state.conference || state.joining;
87
     const conference_ = state.conference || state.joining;
87
 
88
 
88
     if (conference_ && conference_ !== conference) {
89
     if (conference_ && conference_ !== conference) {

+ 4
- 2
react/features/base/connection/reducer.js 查看文件

97
             error: Object | string
97
             error: Object | string
98
         }) {
98
         }) {
99
 
99
 
100
-    // The active or in-progress connection.
101
-    const connection_ = state.connecting || state.connection;
100
+    // The current (similar to getCurrentConference in
101
+    // base/conference/functions.js) connection which is connecting or
102
+    // connected:
103
+    const connection_ = state.connection || state.connecting;
102
 
104
 
103
     if (connection_ && connection_ !== connection) {
105
     if (connection_ && connection_ !== connection) {
104
         return state;
106
         return state;

Loading…
取消
儲存