瀏覽代碼

feat: Fix display name in prejoin stealing focus.

When there is a password and lobby enabled, participants cannot enter password as the display name is stealing the focus.
When there is just password set the same field steals the focus from the password prompt.
master
Дамян Минков 3 年之前
父節點
當前提交
1bce1524db
共有 1 個檔案被更改,包括 8 行新增3 行删除
  1. 8
    3
      react/features/base/conference/middleware.web.js

+ 8
- 3
react/features/base/conference/middleware.web.js 查看文件

@@ -44,9 +44,14 @@ MiddlewareRegistry.register(store => next => action => {
44 44
         break;
45 45
     }
46 46
     case CONFERENCE_FAILED: {
47
-        enableForcedReload
48
-            && action.error?.name === JitsiConferenceErrors.CONFERENCE_RESTARTED
49
-            && dispatch(setSkipPrejoinOnReload(true));
47
+        const errorName = action.error?.name;
48
+
49
+        if (errorName === JitsiConferenceErrors.MEMBERS_ONLY_ERROR
50
+            || errorName === JitsiConferenceErrors.PASSWORD_REQUIRED) {
51
+            dispatch(setPrejoinPageVisibility(false));
52
+        } else if (enableForcedReload && errorName === JitsiConferenceErrors.CONFERENCE_RESTARTED) {
53
+            dispatch(setSkipPrejoinOnReload(true));
54
+        }
50 55
 
51 56
         break;
52 57
     }

Loading…
取消
儲存