fixes

README.md

@@ -44,6 +44,7 @@ var rtc = require('rtc-everywhere')();
 // rtc.RTCIceCandidate
 // rtc.RTCSessionDescription
 // rtc.getUserMedia
+// rtc.attachStream(stream, videoElement)
 ```
 
 ### API
@@ -71,6 +72,14 @@ rtc.getUserMedia(function(err, stream){});
 rtc.getUserMedia({video: true, audio: true}, function(err, stream){});
 ```
 
+#### attachStream(stream, element)
+
+- Attaches a stream to a given video element
+- Returns the element the video was attached to
+- In IE and Safari, the video element will be replaced by an `object` element
+  - Elements will not be replaced or modified unless they exist on the DOM
+  - Regardless of replacement, the new `object` element will be returned
+
 ### Related Libraries
 - [simple-peer](https://github.com/feross/simple-peer)
 - [blob-util](https://github.com/nolanlawson/blob-util)

examples/loopback/index.js

@@ -1,10 +1,10 @@
-require('es5-shim-sham');
+//require('es5-shim-sham');
 
 var rtc = require('../../')();
 var Peer = require('simple-peer');
 var crel = require('crel');
 var browser = require('detect-browser');
-var isStreamWorking = require('../../util/isStreamWorking');
+var onStreamLoaded = require('../../util/onStreamLoaded');
 
 window.rtc = rtc;
 
@@ -17,7 +17,7 @@ function makeVideo(stream) {
   var el = crel('video', {
     muted: true,
     autoplay: true,
-    className: 'video-stream'
+    className: 'video-stream',
     style: 'height:100px; width:100px; display:inline-block; background-color:black;'
   });
   return rtc.attachStream(el, stream);
@@ -27,7 +27,7 @@ rtc.getUserMedia(function(err, stream){
   if (err) {
     return console.error(err);
   }
-  isStreamWorking(stream, function(err, res){
+  onStreamLoaded(stream, function(err, res){
     console.log(err, res);
   });
 

lib/temasys/index.js

@@ -15,6 +15,7 @@ var pluginId = uuid.v4();
 var pageId = uuid.v4();
 var onLoadFn = '___$' + pluginId;
 
+// TODO: handle not installed
 // this takes about 272ms to load the plugin
 module.exports = function(cb){
   if (!isInstalled()) {

platforms/chrome/attachStream.js

@@ -2,7 +2,7 @@
 
 module.exports = function(){
   var URL = window.URL || window.webkitURL;
-  return function(el, stream) {
+  return function(stream, el) {
     el.src = URL.createObjectURL(stream);
     return el;
   };

platforms/chrome/gum.js

@@ -1,10 +1,14 @@
 'use strict';
 
 module.exports = function(opt) {
-  var getUserMedia = navigator.getUserMedia ||
-    navigator.webkitGetUserMedia;
-
   return function(constraints, cb) {
+    var getUserMedia = navigator.getUserMedia ||
+      navigator.webkitGetUserMedia;
+
+    if (!getUserMedia) {
+      throw new Error('Failed to find getUserMedia');
+    }
+
     // make constraints optional
     if (arguments.length !== 2) {
       cb = constraints;

platforms/cordova-ios/attachStream.js

@@ -7,7 +7,7 @@ function needPlatform(){
 module.exports = function(){
   var URL = window.URL || window.webkitURL;
 
-  return function(el, stream) {
+  return function(stream, el) {
     if (typeof cordova === 'undefined') return needPlatform();
     if (typeof cordova.plugins === 'undefined') return needPlatform();
     if (typeof cordova.plugins.iosrtc === 'undefined') return needPlatform();

platforms/edge/attachStream.js

@@ -1,7 +1,7 @@
 'use strict';
 
 module.exports = function(){
-  return function(el, stream) {
+  return function(stream, el) {
     el.srcObject = stream;
     return el;
   };

platforms/edge/gum.js

@@ -5,6 +5,9 @@ module.exports = function(opt) {
     var getUserMedia = navigator.getUserMedia ||
       navigator.msGetUserMedia;
 
+    if (!getUserMedia) {
+      throw new Error('Failed to find getUserMedia');
+    }
     // make constraints optional
     if (arguments.length !== 2) {
       cb = constraints;

platforms/firefox/attachStream.js

@@ -1,7 +1,7 @@
 'use strict';
 
 module.exports = function(){
-  return function(el, stream) {
+  return function(stream, el) {
     el.srcObject = stream;
     return el;
   };

platforms/firefox/gum.js

@@ -5,6 +5,10 @@ module.exports = function(opt) {
     var getUserMedia = navigator.getUserMedia ||
       navigator.mozGetUserMedia;
 
+    if (!getUserMedia) {
+      throw new Error('Failed to find getUserMedia');
+    }
+
     // make constraints optional
     if (arguments.length !== 2) {
       cb = constraints;

platforms/ie/attachStream.js

@@ -3,7 +3,7 @@
 module.exports = function(){
   var copyStyle = require('../../lib/copyStyle');
   var temasys = require('../../lib/temasys');
-  return function(el, stream) {
+  return function(stream, el) {
     var newVideo = temasys.createVideo(stream);
     copyStyle(el, newVideo);
 

platforms/ie/gum.js

@@ -1,5 +1,7 @@
 'use strict';
 
+// TODO: handle not installed
+
 module.exports = function(opt) {
   var temasys = require('../../lib/temasys');
   temasys(); // start loading ahead of time
@@ -24,6 +26,10 @@ module.exports = function(opt) {
     }
 
     temasys(function(rtc){
+      if (!rtc || !rtc.getUserMedia) {
+        throw new Error('Failed to find getUserMedia');
+      }
+
       rtc.getUserMedia(constraints, success, error);
     });
   };

platforms/ie/rtc.js

@@ -1,5 +1,7 @@
 'use strict';
 
+// TODO: handle not installed
+
 module.exports = function() {
   var MockRTC = require('../../lib/temasys/MockRTC');
   return MockRTC;

platforms/react-native/attachStream.js

@@ -1,7 +1,7 @@
 'use strict';
 
 module.exports = function(){
-  return function(el, stream) {
+  return function(stream, el) {
     // TODO
   };
 };

platforms/react-native/gum.js

@@ -10,6 +10,10 @@ module.exports = function(opt) {
   return function(constraints, cb) {
     var getUserMedia = navigator.getUserMedia;
 
+    if (!getUserMedia) {
+      throw new Error('Failed to find getUserMedia');
+    }
+
     // make constraints optional
     if (arguments.length !== 2) {
       cb = constraints;

platforms/safari/attachStream.js

@@ -3,7 +3,7 @@
 module.exports = function(){
   var copyStyle = require('../../lib/copyStyle');
   var temasys = require('../../lib/temasys');
-  return function(el, stream) {
+  return function(stream, el) {
     var newVideo = temasys.createVideo(stream);
     copyStyle(el, newVideo);
 

platforms/safari/gum.js

@@ -1,5 +1,7 @@
 'use strict';
 
+// TODO: handle not installed
+
 module.exports = function(opt) {
   var temasys = require('../../lib/temasys');
   temasys(); // start loading ahead of time
@@ -24,6 +26,9 @@ module.exports = function(opt) {
     }
 
     temasys(function(rtc){
+      if (!rtc || !rtc.getUserMedia) {
+        throw new Error('Failed to find getUserMedia');
+      }
       rtc.getUserMedia(constraints, success, error);
     });
   };

platforms/safari/rtc.js

@@ -1,5 +1,7 @@
 'use strict';
 
+// TODO: handle not installed
+
 module.exports = function() {
   var MockRTC = require('../../lib/temasys/MockRTC');
   return MockRTC;

platforms/unsupported/attachStream.js

@@ -1,7 +1,7 @@
 'use strict';
 
 module.exports = function(){
-  return function(el, stream) {
+  return function(stream, el) {
     throw new Error('No DOM, what are you doing?');
   };
 };

util/onStreamLoaded/index.js

@@ -6,8 +6,8 @@ var isVideoWorking = require('./isVideoWorking');
 
 function isStreamWorking(opt, stream, cb) {
   if (arguments.length !== 3) {
-    stream = opt;
     cb = stream;
+    stream = opt;
     opt = null;
   }
   if (!opt) {

util/onStreamLoaded/isVideoWorking.js

@@ -44,8 +44,8 @@ function isVideoWorking(stream, cb){
   });
 
   actualEl = rtcInst.attachStream(stream, vidEl);
-  actualEl.addEventListener('canplay', canPlay, false);
-  actualEl.addEventListener('playing', canPlay, false);
+  actualEl.addEventListener('canplay', finishIt.bind(null, null), false);
+  actualEl.addEventListener('playing', finishIt.bind(null, null), false);
 }
 
 module.exports = isVideoWorking;