浏览代码

Merge branch 'master' of github.com:jitsi/jitsi-meet

j8
hristoterezov 10 年前
父节点
当前提交
02ca5e5732
共有 4 个文件被更改,包括 4 次插入4 次删除
  1. 1
    1
      libs/modules/RTC.bundle.js
  2. 1
    1
      libs/modules/xmpp.bundle.js
  3. 1
    1
      modules/RTC/DataChannels.js
  4. 1
    1
      modules/xmpp/strophe.emuc.js

+ 1
- 1
libs/modules/RTC.bundle.js 查看文件

151
      */
151
      */
152
     init: function (peerConnection, emitter) {
152
     init: function (peerConnection, emitter) {
153
         if(!config.openSctp)
153
         if(!config.openSctp)
154
-            retrun;
154
+            return;
155
 
155
 
156
         peerConnection.ondatachannel = this.onDataChannel;
156
         peerConnection.ondatachannel = this.onDataChannel;
157
         eventEmitter = emitter;
157
         eventEmitter = emitter;

+ 1
- 1
libs/modules/xmpp.bundle.js 查看文件

3801
             var self = this;
3801
             var self = this;
3802
             // Remove old ssrcs coming from the jid
3802
             // Remove old ssrcs coming from the jid
3803
             Object.keys(this.ssrc2jid).forEach(function (ssrc) {
3803
             Object.keys(this.ssrc2jid).forEach(function (ssrc) {
3804
-                if (self.ssrc2jid[ssrc] == jid) {
3804
+                if (self.ssrc2jid[ssrc] == from) {
3805
                     delete self.ssrc2jid[ssrc];
3805
                     delete self.ssrc2jid[ssrc];
3806
                 }
3806
                 }
3807
             });
3807
             });

+ 1
- 1
modules/RTC/DataChannels.js 查看文件

150
      */
150
      */
151
     init: function (peerConnection, emitter) {
151
     init: function (peerConnection, emitter) {
152
         if(!config.openSctp)
152
         if(!config.openSctp)
153
-            retrun;
153
+            return;
154
 
154
 
155
         peerConnection.ondatachannel = this.onDataChannel;
155
         peerConnection.ondatachannel = this.onDataChannel;
156
         eventEmitter = emitter;
156
         eventEmitter = emitter;

+ 1
- 1
modules/xmpp/strophe.emuc.js 查看文件

570
             var self = this;
570
             var self = this;
571
             // Remove old ssrcs coming from the jid
571
             // Remove old ssrcs coming from the jid
572
             Object.keys(this.ssrc2jid).forEach(function (ssrc) {
572
             Object.keys(this.ssrc2jid).forEach(function (ssrc) {
573
-                if (self.ssrc2jid[ssrc] == jid) {
573
+                if (self.ssrc2jid[ssrc] == from) {
574
                     delete self.ssrc2jid[ssrc];
574
                     delete self.ssrc2jid[ssrc];
575
                 }
575
                 }
576
             });
576
             });

正在加载...
取消
保存