FS-7699

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

@@ -2145,11 +2145,9 @@
     $.verto.videoDevices = [];
     $.verto.audioDevices = [];
 
-    $.verto.init = function(obj, runtime) {
-	var aud = [], vid = [];
-	
-	$.FSRTC.getValidRes(obj.camera, function() {
+    var checkDevices = function(runtime) {
 	console.info("enumerating devices");
+	var aud = [], vid = [];	
 
 	if (MediaStreamTrack.getSources) {
 	    MediaStreamTrack.getSources(function (media_sources) {
@@ -2206,8 +2204,15 @@
 		.catch(function(err) {
 		    console.log(err.name + ": " + error.message);
 		    runtime();
-		    });
+		}).else(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 = [];