FS-8213 #resolve [Add support to skip permission checks on verto]

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

@@ -453,7 +453,10 @@
 
 	var audio;
 
-	if (obj.options.videoParams && obj.options.screenShare) {//obj.options.videoParams.chromeMediaSource == 'desktop') {
+	if (obj.options.useMic && obj.options.useMic === "none") {
+	    console.log("Microphone Disabled");
+	    audio = false;
+	} else if (obj.options.videoParams && obj.options.screenShare) {//obj.options.videoParams.chromeMediaSource == 'desktop') {
 
 	    //obj.options.videoParams = {
 	//	chromeMediaSource: 'screen',
@@ -523,6 +526,7 @@
 	    }
 
 	} else {
+	    console.log("Camera Disabled");
 	    video = false;
 	    useVideo = false;
 	}
@@ -590,17 +594,20 @@
 	console.log("Audio constraints", mediaParams.audio);
 	console.log("Video constraints", mediaParams.video);
 
+	if (mediaParams.audio || mediaParams.video) {
 
-        getUserMedia({
-            constraints: {
-                audio: mediaParams.audio,
+            getUserMedia({
+		constraints: {
+                    audio: mediaParams.audio,
                 video: mediaParams.video
-            },
-            video: mediaParams.useVideo,
-            onsuccess: onSuccess,
-            onerror: onError
-        });
-
+		},
+		video: mediaParams.useVideo,
+		onsuccess: onSuccess,
+		onerror: onError
+            });
+	} else {
+	    onSuccess(null);
+	}
 
 
 

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

@@ -2601,17 +2601,25 @@
 	checkDevices(runtime);
     }
 
-    $.verto.init = function(obj, runtime, check) {
-        if(check == undefined) {
-            check = true;
-        }
-	$.FSRTC.checkPerms(function(status) {
-          if(check) {
+    $.verto.init = function(obj, runtime) {
+	if (!obj) {
+	    obj = {};
+	}
+
+	if (!obj.skipPermCheck && !obj.skipDeviceCheck) {
+	    $.FSRTC.checkPerms(function(status) {
+		checkDevices(runtime);
+	    }, true, true);
+	} else if (obj.skipPermCheck && !obj.skipDeviceCheck) {
 	    checkDevices(runtime);
-          } else {
-            runtime(status);
-          }
-	}, true, true);
+	} else if (!obj.skipPermCheck && obj.skipDeviceCheck) {
+	    $.FSRTC.checkPerms(function(status) {
+		runtime(status);
+	    }, true, true);
+	} else {
+	    runtime(null);
+	}
+
     }
 
     $.verto.genUUID = function () {

html5/verto/verto_communicator/src/vertoService/services/vertoService.js

@@ -576,12 +576,12 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
         if(data.mediaPerm) {
           ourBootstrap();
         } else {
-          $.verto.init({}, ourBootstrap, false);
+            $.verto.init({skipDeviceCheck: true}, ourBootstrap);
         }
       },
 
       mediaPerm: function(callback) {
-        $.verto.init({}, callback, false);
+	  $.FSRTC.checkPerms(callback, true, true);
       },
 
       /**

html5/verto/video_demo/verto.js

@@ -984,6 +984,8 @@ function refresh_devices()
 
     $("#useshare").append(o);
 
+    $("#usemic").append(new Option("No Microphone", "none"));
+
     
     $("#usecamera").selectmenu('refresh', true);
     $("#usemic").selectmenu('refresh', true);
@@ -1593,7 +1595,7 @@ $(window).load(function() {
     $("#search").show();
     goto_page("enum");
     setTimeout(function() {
-	$.verto.init({}, init);
+	$.verto.init({skipPermCheck: false}, init);
     }, 1000);
 
 });