FS-7699

html5/verto/js/src/jquery.verto.js

@@ -2145,69 +2145,74 @@
     $.verto.videoDevices = [];
     $.verto.audioDevices = [];
 
-    $.verto.init = function(obj, runtime) {
-	var aud = [], vid = [];
-	
-	$.FSRTC.getValidRes(obj.camera, function() {
-	    console.info("enumerating devices");
+    var checkDevices = function(runtime) {
+	console.info("enumerating devices");
+	var aud = [], vid = [];	
+
+	if (MediaStreamTrack.getSources) {
+	    MediaStreamTrack.getSources(function (media_sources) {
+		for (var i = 0; i < media_sources.length; i++) {
+
+		    if (media_sources[i].kind == 'video') {
+			vid.push(media_sources[i]);
+		    } else {
+			aud.push(media_sources[i]);
+		    }
+		}
+		
+		$.verto.videoDevices = vid;
+		$.verto.audioDevices = aud;
+		
+		console.info("Audio Devices", $.verto.audioDevices);
+		console.info("Video Devices", $.verto.videoDevices);
+		runtime();
+	    });
+	} else {
+	    /* of course it's a totally different API CALL with different element names for the same exact thing */
 	    
-	    if (MediaStreamTrack.getSources) {
-		MediaStreamTrack.getSources(function (media_sources) {
-		    for (var i = 0; i < media_sources.length; i++) {
+	    if (!navigator.mediaDevices || !navigator.mediaDevices.enumerateDevices) {
+		console.log("enumerateDevices() not supported.");
+		return;
+	    }
+
+	    // List cameras and microphones.
+
+	    navigator.mediaDevices.enumerateDevices()
+		.then(function(devices) {
+		    devices.forEach(function(device) {
+			console.log(device);
 
-			if (media_sources[i].kind == 'video') {
-			    vid.push(media_sources[i]);
+			console.log(device.kind + ": " + device.label +
+				    " id = " + device.deviceId);
+			
+			if (device.kind === "videoinput") {
+			    vid.push({id: device.deviceId, kind: "video", label: device.label});
 			} else {
-			    aud.push(media_sources[i]);
+			    aud.push({id: device.deviceId, kind: "audio", label: device.label});
 			}
-		    }
+		    });
 		    
+
 		    $.verto.videoDevices = vid;
 		    $.verto.audioDevices = aud;
 		    
 		    console.info("Audio Devices", $.verto.audioDevices);
 		    console.info("Video Devices", $.verto.videoDevices);
 		    runtime();
-		});
-	    } else {
-		/* of course it's a totally different API CALL with different element names for the same exact thing */
-		
-		if (!navigator.mediaDevices || !navigator.mediaDevices.enumerateDevices) {
-		    console.log("enumerateDevices() not supported.");
-		    return;
-		}
+		    
+		})
+		.catch(function(err) {
+		    console.log(err.name + ": " + error.message);
+		    runtime();
+		}).else(runtime);
+	}
 
-		// List cameras and microphones.
+    };
 
-		navigator.mediaDevices.enumerateDevices()
-		    .then(function(devices) {
-			devices.forEach(function(device) {
-			    console.log(device);
 
-			    console.log(device.kind + ": " + device.label +
-					" id = " + device.deviceId);
-			    
-			    if (device.kind === "videoinput") {
-				vid.push({id: device.deviceId, kind: "video", label: device.label});
-			    } else {
-				aud.push({id: device.deviceId, kind: "audio", label: device.label});
-			    }
-			});
-			
-
-			$.verto.videoDevices = vid;
-			$.verto.audioDevices = aud;
-			
-			console.info("Audio Devices", $.verto.audioDevices);
-			console.info("Video Devices", $.verto.videoDevices);
-			runtime();
-			
-		    })
-		    .catch(function(err) {
-			console.log(err.name + ": " + error.message);
-			runtime();
-		    });
-	    }
+    $.verto.init = function(obj, runtime) {
+	checkDevices(function() {
+	    $.FSRTC.getValidRes(obj.camera, runtime);
 	});
     }
 

html5/verto/video_demo/verto.js

@@ -1240,7 +1240,7 @@ function init() {
     refresh_devices();
 }
 
-$(document).ready(function() {
+$(window).load(function() {
     var hash = window.location.hash.substring(1);    
     var a = [];