Sfoglia il codice sorgente

Fixes issues after review

dev1
hristoterezov 9 anni fa
parent
commit
85fd13a082

+ 6
- 3
JitsiConference.js Vedi File

1083
     conference.room.addListener(XMPPEvents.CONNECTION_RESTORED, function () {
1083
     conference.room.addListener(XMPPEvents.CONNECTION_RESTORED, function () {
1084
         conference.eventEmitter.emit(JitsiConferenceEvents.CONNECTION_RESTORED);
1084
         conference.eventEmitter.emit(JitsiConferenceEvents.CONNECTION_RESTORED);
1085
     });
1085
     });
1086
-    conference.room.addListener(XMPPEvents.CONFERENCE_SETUP_FAILED, function () {
1087
-        conference.eventEmitter.emit(JitsiConferenceEvents.CONFERENCE_FAILED, JitsiConferenceErrors.SETUP_FAILED);
1086
+    conference.room.addListener(XMPPEvents.CONFERENCE_SETUP_FAILED,
1087
+    function (error) {
1088
+        conference.eventEmitter.emit(JitsiConferenceEvents.CONFERENCE_FAILED,
1089
+            JitsiConferenceErrors.SETUP_FAILED, error);
1088
     });
1090
     });
1089
 
1091
 
1090
     conference.room.addListener(AuthenticationEvents.IDENTITY_UPDATED, function (authEnabled, authIdentity) {
1092
     conference.room.addListener(AuthenticationEvents.IDENTITY_UPDATED, function (authEnabled, authIdentity) {
1296
             function (pc) {
1298
             function (pc) {
1297
                 conference.statistics.sendIceConnectionFailedEvent(pc);
1299
                 conference.statistics.sendIceConnectionFailedEvent(pc);
1298
                 conference.room.eventEmitter.emit(
1300
                 conference.room.eventEmitter.emit(
1299
-                    XMPPEvents.CONFERENCE_SETUP_FAILED);
1301
+                    XMPPEvents.CONFERENCE_SETUP_FAILED,
1302
+                    new Error("ICE fail")); 
1300
             });
1303
             });
1301
 
1304
 
1302
         conference.rtc.addListener(RTCEvents.TRACK_ATTACHED,
1305
         conference.rtc.addListener(RTCEvents.TRACK_ATTACHED,

+ 2
- 2
modules/util/GlobalOnErrorHandler.js Vedi File

62
         var errHandler = window.onerror;
62
         var errHandler = window.onerror;
63
         if(!errHandler)
63
         if(!errHandler)
64
             return;
64
             return;
65
-        errHandler.call(null, null, null, null, null, error);
65
+        errHandler(null, null, null, null, error);
66
     },
66
     },
67
     /**
67
     /**
68
      * Calls the global rejection handler if there is one.
68
      * Calls the global rejection handler if there is one.
72
         var errHandler = window.onunhandledrejection;
72
         var errHandler = window.onunhandledrejection;
73
         if(!errHandler)
73
         if(!errHandler)
74
             return;
74
             return;
75
-        errHandler.call(null, error);
75
+        errHandler(error);
76
     }
76
     }
77
 };
77
 };
78
 
78
 

+ 1
- 1
modules/xmpp/JingleSessionPC.js Vedi File

1218
 
1218
 
1219
 JingleSessionPC.onJingleFatalError = function (session, error)
1219
 JingleSessionPC.onJingleFatalError = function (session, error)
1220
 {
1220
 {
1221
-    this.room.eventEmitter.emit(XMPPEvents.CONFERENCE_SETUP_FAILED);
1221
+    this.room.eventEmitter.emit(XMPPEvents.CONFERENCE_SETUP_FAILED, error);
1222
     this.room.eventEmitter.emit(XMPPEvents.JINGLE_FATAL_ERROR, session, error);
1222
     this.room.eventEmitter.emit(XMPPEvents.JINGLE_FATAL_ERROR, session, error);
1223
 };
1223
 };
1224
 
1224
 

Loading…
Annulla
Salva