Преглед изворни кода

Revert "fix(hangup): destroy local tracks on conference leave (#2502)"

This reverts commit 88325aeef2.
Turns out a conference with a password triggers a failed conference
join. It's going to be tricky to decipher when to do actual
cleanup, and where to shove that code, so reverting is easier for
now.
master
Leonard Kim пре 7 година
родитељ
комит
ce6e8472f0

+ 2
- 3
modules/UI/UI.js Прегледај датотеку

@@ -377,12 +377,11 @@ UI.start = function() {
377 377
 };
378 378
 
379 379
 /**
380
- * Invokes cleanup of large video so it stops running polling tasks and stops
381
- * displaying.
380
+ * Invokes cleanup of any deferred execution within relevant UI modules.
382 381
  *
383 382
  * @returns {void}
384 383
  */
385
-UI.resetLargeVideo = () => {
384
+UI.stopDaemons = () => {
386 385
     VideoLayout.resetLargeVideo();
387 386
 };
388 387
 

+ 0
- 2
modules/UI/videolayout/LargeVideoManager.js Прегледај датотеку

@@ -129,8 +129,6 @@ export default class LargeVideoManager {
129 129
             this._onVideoResolutionUpdate);
130 130
 
131 131
         this.removePresenceLabel();
132
-
133
-        this.$container.remove();
134 132
     }
135 133
 
136 134
     /**

+ 1
- 6
react/features/base/conference/middleware.js Прегледај датотеку

@@ -17,7 +17,7 @@ import {
17 17
 } from '../participants';
18 18
 import { MiddlewareRegistry } from '../redux';
19 19
 import UIEvents from '../../../../service/UI/UIEvents';
20
-import { TRACK_ADDED, TRACK_REMOVED, destroyLocalTracks } from '../tracks';
20
+import { TRACK_ADDED, TRACK_REMOVED } from '../tracks';
21 21
 
22 22
 import {
23 23
     createConference,
@@ -144,11 +144,6 @@ function _conferenceFailedOrLeft({ dispatch, getState }, next, action) {
144 144
         dispatch(setAudioOnly(true));
145 145
     }
146 146
 
147
-    if (typeof APP === 'object') {
148
-        dispatch(destroyLocalTracks());
149
-        APP.UI.resetLargeVideo();
150
-    }
151
-
152 147
     return result;
153 148
 }
154 149
 

+ 1
- 0
react/features/conference/components/Conference.web.js Прегледај датотеку

@@ -87,6 +87,7 @@ class Conference extends Component<Props> {
87 87
      * @inheritdoc
88 88
      */
89 89
     componentWillUnmount() {
90
+        APP.UI.stopDaemons();
90 91
         APP.UI.unregisterListeners();
91 92
         APP.UI.unbindEvents();
92 93
 

Loading…
Откажи
Сачувај