Browse Source

Merge pull request #24 from damencho/onended-temasys

Fixes attaching onended handler when using Temasys.
master
Paweł Domas 9 years ago
parent
commit
0a25a5d606
1 changed files with 5 additions and 21 deletions
  1. 5
    21
      modules/RTC/JitsiTrack.js

+ 5
- 21
modules/RTC/JitsiTrack.js View File

@@ -32,27 +32,11 @@ function implementOnEndedHandling(jitsiTrack) {
32 32
  * @param handler the handler
33 33
  */
34 34
 function addMediaStreamInactiveHandler(mediaStream, handler) {
35
-    if(RTCBrowserType.isTemasysPluginUsed()) {
36
-        // themasys
37
-        //FIXME: Seems that not working properly.
38
-        if(mediaStream.onended) {
39
-            mediaStream.onended = handler;
40
-        } else if(mediaStream.addEventListener) {
41
-            mediaStream.addEventListener('ended', function () {
42
-                handler(mediaStream);
43
-            });
44
-        } else if(mediaStream.attachEvent) {
45
-            mediaStream.attachEvent('ended', function () {
46
-                handler(mediaStream);
47
-            });
48
-        }
49
-    }
50
-    else {
51
-        if(typeof mediaStream.active !== "undefined")
52
-            mediaStream.oninactive = handler;
53
-        else
54
-            mediaStream.onended = handler;
55
-    }
35
+    // Temasys will use onended
36
+    if(typeof mediaStream.active !== "undefined")
37
+        mediaStream.oninactive = handler;
38
+    else
39
+        mediaStream.onended = handler;
56 40
 }
57 41
 
58 42
 /**

Loading…
Cancel
Save