hristoterezov 10 лет назад
Родитель
Сommit
6235ff163e

+ 1
- 1
index.html Просмотреть файл

@@ -22,7 +22,7 @@
22 22
     <script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib -->
23 23
     <script src="libs/toastr.js?v=1"></script><!-- notifications lib -->
24 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 26
     <script src="analytics.js?v=1"></script><!-- google analytics plugin -->
27 27
     <link rel="stylesheet" href="css/font.css?v=7"/>
28 28
     <link rel="stylesheet" href="css/toastr.css?v=1">

+ 2
- 4
libs/app.bundle.js Просмотреть файл

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

+ 1
- 1
modules/UI/videolayout/SmallVideo.js Просмотреть файл

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

+ 1
- 1
modules/UI/videolayout/VideoLayout.js Просмотреть файл

@@ -328,7 +328,7 @@ var VideoLayout = (function (my) {
328 328
      * @param {boolean} isMuted
329 329
      */
330 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 Просмотреть файл

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

Загрузка…
Отмена
Сохранить