提交 aacede19 authored 作者: Anthony Minessale's avatar Anthony Minessale 提交者: Michael Jerris

FS-7509 update the verto demo to init properly with new $.verto.init() so…

FS-7509 update the verto demo to init properly with new $.verto.init() so resolutions and devices can be parsed properly
上级 272108f0
......@@ -751,57 +751,58 @@ function refresh_devices()
$("#usemic").empty();
$.verto.init({camera: null}, function() {
var x = 0;
$("#usecamera").append(new Option("No Camera", "none"));
for (var i in $.verto.videoDevices) {
var source = $.verto.videoDevices[i];
var o = new Option(source.label, source.id);
if (!x) {
o.selected = true;
}
$("#usecamera").append(o);
var oo = new Option(source.label, source.id);
if (!x++) {
o.selected = true;
}
var x = 0;
$("#useshare").append(oo);
$("#usecamera").append(new Option("No Camera", "none"));
for (var i in $.verto.videoDevices) {
var source = $.verto.videoDevices[i];
var o = new Option(source.label, source.id);
if (!x) {
o.selected = true;
}
$("#usecamera").append(o);
x = 0;
for (var i in $.verto.audioDevices) {
var source = $.verto.audioDevices[i];
var o = new Option(source.label, source.id);
if (!x++) {
o.selected = true;
}
$("#usemic").append(o);
var oo = new Option(source.label, source.id);
if (!x++) {
o.selected = true;
}
$("#useshare").append(oo);
}
var o = new Option("Screen", "screen");
o.selected = true;
x = 0;
for (var i in $.verto.audioDevices) {
var source = $.verto.audioDevices[i];
var o = new Option(source.label, source.id);
if (!x++) {
o.selected = true;
}
$("#usemic").append(o);
}
$("#useshare").append(o);
$("#usecamera").selectmenu('refresh', true);
$("#usemic").selectmenu('refresh', true);
$("#useshare").selectmenu('refresh', true);
var o = new Option("Screen", "screen");
o.selected = true;
//console.error($("#usecamera").find(":selected").val());
$("#useshare").append(o);
});
$("#usecamera").selectmenu('refresh', true);
$("#usemic").selectmenu('refresh', true);
$("#useshare").selectmenu('refresh', true);
//console.error($("#usecamera").find(":selected").val());
}
function init() {
cur_call = null;
$("#usecamera").selectmenu({});
$("#usemic").selectmenu({});
$("#useshare").selectmenu({});
if (!autocall) {
pop("#ext", "verto_demo_ext", "3500");
}
......@@ -1257,8 +1258,10 @@ $(document).ready(function() {
// $("#rows").css("position", "absolute").css("z-index", "2");
$("#usrctl").show();
$("#usr2").hide();
//$("#usrctl").show();
//$("#usr2").hide();
$("#usrctl").hide();
$("#rows").mouseover(function() {
$("#usr2").show();
......@@ -1269,11 +1272,13 @@ $(document).ready(function() {
});
$("#usr2").mouseleave(function() {
usrto = setTimeout(function() { $("#usr2").hide(); }, 2000);
if (is_full) {
usrto = setTimeout(function() { $("#usr2").hide(); }, 2000);
}
});
init();
$.verto.init({}, init);
});
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论