Quellcode durchsuchen

Fixes JS errors on Temasys

release-8443
hristoterezov vor 10 Jahren
Ursprung
Commit
2756c124ac
3 geänderte Dateien mit 26 neuen und 8 gelöschten Zeilen
  1. 13
    4
      lib-jitsi-meet.js
  2. 1
    1
      modules/RTC/JitsiLocalTrack.js
  3. 12
    3
      modules/RTC/JitsiTrack.js

+ 13
- 4
lib-jitsi-meet.js Datei anzeigen

@@ -1397,7 +1397,7 @@ JitsiLocalTrack.prototype.stop = function () {
1397 1397
     if(!this.stream)
1398 1398
         return;
1399 1399
     if(this.rtc)
1400
-        this.rtc.room.removeStream(this.stream);
1400
+        this.rtc.room.removeStream(this.stream, function () {});
1401 1401
     RTC.stopMediaStream(this.stream);
1402 1402
     this.detach();
1403 1403
 }
@@ -1547,9 +1547,18 @@ function implementOnEndedHandling(jitsiTrack) {
1547 1547
 function addMediaStreamInactiveHandler(mediaStream, handler) {
1548 1548
     if(RTCBrowserType.isTemasysPluginUsed()) {
1549 1549
         // themasys
1550
-        mediaStream.attachEvent('ended', function () {
1551
-            handler(mediaStream);
1552
-        });
1550
+        //FIXME: Seems that not working properly.
1551
+        if(mediaStream.onended) {
1552
+            mediaStream.onended = handler;
1553
+        } else if(mediaStream.addEventListener) {
1554
+            mediaStream.addEventListener('ended', function () {
1555
+                handler(mediaStream);
1556
+            });
1557
+        } else if(mediaStream.attachEvent) {
1558
+            mediaStream.attachEvent('ended', function () {
1559
+                handler(mediaStream);
1560
+            });
1561
+        }
1553 1562
     }
1554 1563
     else {
1555 1564
         if(typeof mediaStream.active !== "undefined")

+ 1
- 1
modules/RTC/JitsiLocalTrack.js Datei anzeigen

@@ -112,7 +112,7 @@ JitsiLocalTrack.prototype.stop = function () {
112 112
     if(!this.stream)
113 113
         return;
114 114
     if(this.rtc)
115
-        this.rtc.room.removeStream(this.stream);
115
+        this.rtc.room.removeStream(this.stream, function () {});
116 116
     RTC.stopMediaStream(this.stream);
117 117
     this.detach();
118 118
 }

+ 12
- 3
modules/RTC/JitsiTrack.js Datei anzeigen

@@ -27,9 +27,18 @@ function implementOnEndedHandling(jitsiTrack) {
27 27
 function addMediaStreamInactiveHandler(mediaStream, handler) {
28 28
     if(RTCBrowserType.isTemasysPluginUsed()) {
29 29
         // themasys
30
-        mediaStream.attachEvent('ended', function () {
31
-            handler(mediaStream);
32
-        });
30
+        //FIXME: Seems that not working properly.
31
+        if(mediaStream.onended) {
32
+            mediaStream.onended = handler;
33
+        } else if(mediaStream.addEventListener) {
34
+            mediaStream.addEventListener('ended', function () {
35
+                handler(mediaStream);
36
+            });
37
+        } else if(mediaStream.attachEvent) {
38
+            mediaStream.attachEvent('ended', function () {
39
+                handler(mediaStream);
40
+            });
41
+        }
33 42
     }
34 43
     else {
35 44
         if(typeof mediaStream.active !== "undefined")

Laden…
Abbrechen
Speichern