Browse Source

Fixes Uncaught TypeError: mediaStream.detachEvent on stopping desktop sharing.

master
damencho 10 years ago
parent
commit
5f6bba435c
1 changed files with 12 additions and 12 deletions
  1. 12
    12
      modules/RTC/RTC.js

+ 12
- 12
modules/RTC/RTC.js View File

@@ -300,18 +300,18 @@ var RTC = {
300 300
      * @param handler the handler
301 301
      */
302 302
     addMediaStreamInactiveHandler: function (mediaStream, handler) {
303
-        if (mediaStream.addEventListener) {
304
-            // chrome
305
-            if(typeof mediaStream.active !== "undefined")
306
-                mediaStream.oninactive = handler;
307
-            else
308
-                mediaStream.onended = handler;
309
-        } else {
303
+        if(RTCBrowserType.isTemasysPluginUsed()) {
310 304
             // themasys
311 305
             mediaStream.attachEvent('ended', function () {
312 306
                 handler(mediaStream);
313 307
             });
314 308
         }
309
+        else {
310
+            if(typeof mediaStream.active !== "undefined")
311
+                mediaStream.oninactive = handler;
312
+            else
313
+                mediaStream.onended = handler;
314
+        }
315 315
     },
316 316
     /**
317 317
      * Removes onended/inactive handler.
@@ -319,15 +319,15 @@ var RTC = {
319 319
      * @param handler the handler to remove.
320 320
      */
321 321
     removeMediaStreamInactiveHandler: function (mediaStream, handler) {
322
-        if (mediaStream.removeEventListener) {
323
-            // chrome
322
+        if(RTCBrowserType.isTemasysPluginUsed()) {
323
+            // themasys
324
+            mediaStream.detachEvent('ended', handler);
325
+        }
326
+        else {
324 327
             if(typeof mediaStream.active !== "undefined")
325 328
                 mediaStream.oninactive = null;
326 329
             else
327 330
                 mediaStream.onended = null;
328
-        } else {
329
-            // themasys
330
-            mediaStream.detachEvent('ended', handler);
331 331
         }
332 332
     }
333 333
 };

Loading…
Cancel
Save