소스 검색

Disable status change notifications when join/leave notifications are disabled.

master
damencho 5 년 전
부모
커밋
a425e9c92e
2개의 변경된 파일10개의 추가작업 그리고 4개의 파일을 삭제
  1. 6
    2
      interface_config.js
  2. 4
    2
      modules/UI/UI.js

+ 6
- 2
interface_config.js 파일 보기

195
      */
195
      */
196
     ENABLE_SCREENSHOT_CAPTURE: false,
196
     ENABLE_SCREENSHOT_CAPTURE: false,
197
 
197
 
198
-    // If true, presence status: busy, calling, connected etc. is not displayed
198
+    /**
199
+     * If true, presence status: busy, calling, connected etc. is not displayed.
200
+     */
199
     DISABLE_PRESENCE_STATUS: false,
201
     DISABLE_PRESENCE_STATUS: false,
200
 
202
 
201
-    // If true, notifications regarding joining/leaving are no longer displayed
203
+    /**
204
+     * If true, notifications regarding joining/leaving are no longer displayed.
205
+     */
202
     DISABLE_JOIN_LEAVE_NOTIFICATIONS: false,
206
     DISABLE_JOIN_LEAVE_NOTIFICATIONS: false,
203
 
207
 
204
     /**
208
     /**

+ 4
- 2
modules/UI/UI.js 파일 보기

16
 import { toggleChat } from '../../react/features/chat';
16
 import { toggleChat } from '../../react/features/chat';
17
 import { setDocumentUrl } from '../../react/features/etherpad';
17
 import { setDocumentUrl } from '../../react/features/etherpad';
18
 import { setFilmstripVisible } from '../../react/features/filmstrip';
18
 import { setFilmstripVisible } from '../../react/features/filmstrip';
19
-import { setNotificationsEnabled } from '../../react/features/notifications';
19
+import { joinLeaveNotificationsDisabled, setNotificationsEnabled } from '../../react/features/notifications';
20
 import {
20
 import {
21
     dockToolbox,
21
     dockToolbox,
22
     setToolboxEnabled,
22
     setToolboxEnabled,
327
     const reduxState = APP.store.getState() || {};
327
     const reduxState = APP.store.getState() || {};
328
     const { calleeInfoVisible } = reduxState['features/invite'] || {};
328
     const { calleeInfoVisible } = reduxState['features/invite'] || {};
329
 
329
 
330
-    if (!status || calleeInfoVisible) {
330
+    // We hide status updates when join/leave notifications are disabled,
331
+    // as jigasi is the component with statuses and they are seen as join/leave notifications.
332
+    if (!status || calleeInfoVisible || joinLeaveNotificationsDisabled()) {
331
         return;
333
         return;
332
     }
334
     }
333
 
335
 

Loading…
취소
저장