Browse Source

Updates addMediaStreamInactiveHandler (from master 5f6bba435c).

dev1
damencho 10 years ago
parent
commit
e60b79e20d
2 changed files with 14 additions and 14 deletions
  1. 7
    7
      lib-jitsi-meet.js
  2. 7
    7
      modules/RTC/JitsiTrack.js

+ 7
- 7
lib-jitsi-meet.js View File

1305
  * @param handler the handler
1305
  * @param handler the handler
1306
  */
1306
  */
1307
 function addMediaStreamInactiveHandler(mediaStream, handler) {
1307
 function addMediaStreamInactiveHandler(mediaStream, handler) {
1308
-    if (mediaStream.addEventListener) {
1309
-        // chrome
1310
-        if(typeof mediaStream.active !== "undefined")
1311
-            mediaStream.oninactive = handler;
1312
-        else
1313
-            mediaStream.onended = handler;
1314
-    } else {
1308
+    if(RTCBrowserType.isTemasysPluginUsed()) {
1315
         // themasys
1309
         // themasys
1316
         mediaStream.attachEvent('ended', function () {
1310
         mediaStream.attachEvent('ended', function () {
1317
             handler(mediaStream);
1311
             handler(mediaStream);
1318
         });
1312
         });
1319
     }
1313
     }
1314
+    else {
1315
+        if(typeof mediaStream.active !== "undefined")
1316
+            mediaStream.oninactive = handler;
1317
+        else
1318
+            mediaStream.onended = handler;
1319
+    }
1320
 }
1320
 }
1321
 
1321
 
1322
 /**
1322
 /**

+ 7
- 7
modules/RTC/JitsiTrack.js View File

23
  * @param handler the handler
23
  * @param handler the handler
24
  */
24
  */
25
 function addMediaStreamInactiveHandler(mediaStream, handler) {
25
 function addMediaStreamInactiveHandler(mediaStream, handler) {
26
-    if (mediaStream.addEventListener) {
27
-        // chrome
28
-        if(typeof mediaStream.active !== "undefined")
29
-            mediaStream.oninactive = handler;
30
-        else
31
-            mediaStream.onended = handler;
32
-    } else {
26
+    if(RTCBrowserType.isTemasysPluginUsed()) {
33
         // themasys
27
         // themasys
34
         mediaStream.attachEvent('ended', function () {
28
         mediaStream.attachEvent('ended', function () {
35
             handler(mediaStream);
29
             handler(mediaStream);
36
         });
30
         });
37
     }
31
     }
32
+    else {
33
+        if(typeof mediaStream.active !== "undefined")
34
+            mediaStream.oninactive = handler;
35
+        else
36
+            mediaStream.onended = handler;
37
+    }
38
 }
38
 }
39
 
39
 
40
 /**
40
 /**

Loading…
Cancel
Save