Bläddra i källkod

Fixes audio mute.

j8
hristoterezov 10 år sedan
förälder
incheckning
6235ff163e

+ 1
- 1
index.html Visa fil

22
     <script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib -->
22
     <script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib -->
23
     <script src="libs/toastr.js?v=1"></script><!-- notifications lib -->
23
     <script src="libs/toastr.js?v=1"></script><!-- notifications lib -->
24
     <script src="interface_config.js?v=5"></script>
24
     <script src="interface_config.js?v=5"></script>
25
-    <script src="libs/app.bundle.js?v=92"></script>
25
+    <script src="libs/app.bundle.js?v=93"></script>
26
     <script src="analytics.js?v=1"></script><!-- google analytics plugin -->
26
     <script src="analytics.js?v=1"></script><!-- google analytics plugin -->
27
     <link rel="stylesheet" href="css/font.css?v=7"/>
27
     <link rel="stylesheet" href="css/font.css?v=7"/>
28
     <link rel="stylesheet" href="css/toastr.css?v=1">
28
     <link rel="stylesheet" href="css/toastr.css?v=1">

+ 2
- 4
libs/app.bundle.js Visa fil

7902
 SmallVideo.prototype.showAudioIndicator = function(isMuted) {
7902
 SmallVideo.prototype.showAudioIndicator = function(isMuted) {
7903
     var audioMutedSpan = $('#' + this.videoSpanId + '>span.audioMuted');
7903
     var audioMutedSpan = $('#' + this.videoSpanId + '>span.audioMuted');
7904
 
7904
 
7905
-    if (isMuted === 'false') {
7905
+    if (!isMuted) {
7906
         if (audioMutedSpan.length > 0) {
7906
         if (audioMutedSpan.length > 0) {
7907
             audioMutedSpan.popover('hide');
7907
             audioMutedSpan.popover('hide');
7908
             audioMutedSpan.remove();
7908
             audioMutedSpan.remove();
8456
      * @param {boolean} isMuted
8456
      * @param {boolean} isMuted
8457
      */
8457
      */
8458
     my.showLocalAudioIndicator = function(isMuted) {
8458
     my.showLocalAudioIndicator = function(isMuted) {
8459
-        localVideoThumbnail.showAudioIndicator(isMuted.toString());
8459
+        localVideoThumbnail.showAudioIndicator(isMuted);
8460
     };
8460
     };
8461
 
8461
 
8462
     /**
8462
     /**
14988
             if (audioMuted.length) {
14988
             if (audioMuted.length) {
14989
                 eventEmitter.emit(XMPPEvents.AUDIO_MUTED,
14989
                 eventEmitter.emit(XMPPEvents.AUDIO_MUTED,
14990
                     from, (audioMuted.text() === "true"));
14990
                     from, (audioMuted.text() === "true"));
14991
-                $(document).trigger('audiomuted.muc', [from, ]);
14992
             }
14991
             }
14993
 
14992
 
14994
             // Parse video info tag.
14993
             // Parse video info tag.
14996
             if (videoMuted.length) {
14995
             if (videoMuted.length) {
14997
                 eventEmitter.emit(XMPPEvents.VIDEO_MUTED,
14996
                 eventEmitter.emit(XMPPEvents.VIDEO_MUTED,
14998
                     from, (videoMuted.text() === "true"));
14997
                     from, (videoMuted.text() === "true"));
14999
-                $(document).trigger('videomuted.muc', [from, ]);
15000
             }
14998
             }
15001
 
14999
 
15002
             var startMuted = $(pres).find('>startmuted');
15000
             var startMuted = $(pres).find('>startmuted');

+ 1
- 1
modules/UI/videolayout/SmallVideo.js Visa fil

126
 SmallVideo.prototype.showAudioIndicator = function(isMuted) {
126
 SmallVideo.prototype.showAudioIndicator = function(isMuted) {
127
     var audioMutedSpan = $('#' + this.videoSpanId + '>span.audioMuted');
127
     var audioMutedSpan = $('#' + this.videoSpanId + '>span.audioMuted');
128
 
128
 
129
-    if (isMuted === 'false') {
129
+    if (!isMuted) {
130
         if (audioMutedSpan.length > 0) {
130
         if (audioMutedSpan.length > 0) {
131
             audioMutedSpan.popover('hide');
131
             audioMutedSpan.popover('hide');
132
             audioMutedSpan.remove();
132
             audioMutedSpan.remove();

+ 1
- 1
modules/UI/videolayout/VideoLayout.js Visa fil

328
      * @param {boolean} isMuted
328
      * @param {boolean} isMuted
329
      */
329
      */
330
     my.showLocalAudioIndicator = function(isMuted) {
330
     my.showLocalAudioIndicator = function(isMuted) {
331
-        localVideoThumbnail.showAudioIndicator(isMuted.toString());
331
+        localVideoThumbnail.showAudioIndicator(isMuted);
332
     };
332
     };
333
 
333
 
334
     /**
334
     /**

+ 0
- 2
modules/xmpp/strophe.emuc.js Visa fil

145
             if (audioMuted.length) {
145
             if (audioMuted.length) {
146
                 eventEmitter.emit(XMPPEvents.AUDIO_MUTED,
146
                 eventEmitter.emit(XMPPEvents.AUDIO_MUTED,
147
                     from, (audioMuted.text() === "true"));
147
                     from, (audioMuted.text() === "true"));
148
-                $(document).trigger('audiomuted.muc', [from, ]);
149
             }
148
             }
150
 
149
 
151
             // Parse video info tag.
150
             // Parse video info tag.
153
             if (videoMuted.length) {
152
             if (videoMuted.length) {
154
                 eventEmitter.emit(XMPPEvents.VIDEO_MUTED,
153
                 eventEmitter.emit(XMPPEvents.VIDEO_MUTED,
155
                     from, (videoMuted.text() === "true"));
154
                     from, (videoMuted.text() === "true"));
156
-                $(document).trigger('videomuted.muc', [from, ]);
157
             }
155
             }
158
 
156
 
159
             var startMuted = $(pres).find('>startmuted');
157
             var startMuted = $(pres).find('>startmuted');

Laddar…
Avbryt
Spara