浏览代码

Put event forwarder in the right scope

Fix broken variable
master
Sam Whited 9 年前
父节点
当前提交
7f684b5c7a
共有 2 个文件被更改,包括 4 次插入4 次删除
  1. 3
    3
      JitsiConferenceEventManager.js
  2. 1
    1
      modules/xmpp/ChatRoom.js

+ 3
- 3
JitsiConferenceEventManager.js 查看文件

@@ -221,6 +221,9 @@ JitsiConferenceEventManager.prototype.setupChatRoomListeners = function () {
221 221
             conference.leave.bind(conference);
222 222
         });
223 223
 
224
+    this.chatRoomForwarder.forward(XMPPEvents.MUC_LOCK_CHANGED,
225
+        JitsiConferenceEvents.LOCK_STATE_CHANGED);
226
+
224 227
     chatRoom.addListener(XMPPEvents.MUC_MEMBER_JOINED,
225 228
         conference.onMemberJoined.bind(conference));
226 229
     chatRoom.addListener(XMPPEvents.MUC_MEMBER_LEFT,
@@ -470,9 +473,6 @@ JitsiConferenceEventManager.prototype.setupRTCListeners = function () {
470 473
                 JitsiConferenceEvents.ENDPOINT_MESSAGE_RECEIVED,
471 474
                 conference.getParticipantById(from), payload);
472 475
         });
473
-
474
-    this.chatRoomForwarder.forward(XMPPEvents.MUC_LOCK_CHANGED,
475
-        JitsiConferenceEvents.LOCK_STATE_CHANGED);
476 476
 };
477 477
 
478 478
 /**

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

@@ -556,7 +556,7 @@ ChatRoom.prototype.onMessage = function (msg, from) {
556 556
         }
557 557
     }
558 558
 
559
-    if (from==this.myroomjid && $(pres).find('>x[xmlns="http://jabber.org/protocol/muc#user"]>status[code="104"]').length) {
559
+    if (from==this.myroomjid && $(msg).find('>x[xmlns="http://jabber.org/protocol/muc#user"]>status[code="104"]').length) {
560 560
       this.discoRoomInfo();
561 561
     }
562 562
 

正在加载...
取消
保存