瀏覽代碼

Merge pull request #965 from jitsi/raise-hand-update

Updates raised hand to overwrite dominant speaker.
master
yanas 8 年之前
父節點
當前提交
4ffe013165
共有 2 個檔案被更改,包括 5 行新增6 行删除
  1. 2
    6
      conference.js
  2. 3
    0
      modules/UI/videolayout/VideoLayout.js

+ 2
- 6
conference.js 查看文件

@@ -1812,14 +1812,10 @@ export default {
1812 1812
     },
1813 1813
 
1814 1814
     /**
1815
-     * Toggles the local "raised hand" status, if the current state allows
1816
-     * toggling.
1815
+     * Toggles the local "raised hand" status.
1817 1816
      */
1818 1817
     maybeToggleRaisedHand() {
1819
-        // If we are the dominant speaker, we don't enable "raise hand".
1820
-        if (this.isHandRaised || !this.isDominantSpeaker) {
1821
-            this.setRaisedHand(!this.isHandRaised);
1822
-        }
1818
+        this.setRaisedHand(!this.isHandRaised);
1823 1819
     },
1824 1820
 
1825 1821
     /**

+ 3
- 0
modules/UI/videolayout/VideoLayout.js 查看文件

@@ -593,6 +593,9 @@ var VideoLayout = {
593 593
                 ? localVideoThumbnail : remoteVideos[id];
594 594
         if (video) {
595 595
             video.showRaisedHandIndicator(raisedHandStatus);
596
+            if (raisedHandStatus) {
597
+                video.showDominantSpeakerIndicator(false);
598
+            }
596 599
         }
597 600
     },
598 601
 

Loading…
取消
儲存