mirror of
https://github.com/signalwire/freeswitch.git
synced 2025-03-13 20:50:41 +00:00
Merge pull request #1052 in FS/freeswitch from ~FRANCOIS/freeswitch-fs-9728:master to master
* commit 'aada7a56a1e29bd191dba3b486d7870d4b12899a': FS-9728 fix dynamic media tag on verto.newCall method
This commit is contained in:
commit
050ae1967f
@ -1898,11 +1898,6 @@
|
|||||||
$.verto.dialog = function(direction, verto, params) {
|
$.verto.dialog = function(direction, verto, params) {
|
||||||
var dialog = this;
|
var dialog = this;
|
||||||
|
|
||||||
var tag = verto.options.tag;
|
|
||||||
if (typeof(tag) === "function") {
|
|
||||||
tag = tag();
|
|
||||||
}
|
|
||||||
|
|
||||||
dialog.params = $.extend({
|
dialog.params = $.extend({
|
||||||
useVideo: verto.options.useVideo,
|
useVideo: verto.options.useVideo,
|
||||||
useStereo: verto.options.useStereo,
|
useStereo: verto.options.useStereo,
|
||||||
@ -1910,7 +1905,7 @@
|
|||||||
useCamera: verto.options.deviceParams.useCamera,
|
useCamera: verto.options.deviceParams.useCamera,
|
||||||
useMic: verto.options.deviceParams.useMic,
|
useMic: verto.options.deviceParams.useMic,
|
||||||
useSpeak: verto.options.deviceParams.useSpeak,
|
useSpeak: verto.options.deviceParams.useSpeak,
|
||||||
tag: tag,
|
tag: verto.options.tag,
|
||||||
localTag: verto.options.localTag,
|
localTag: verto.options.localTag,
|
||||||
login: verto.options.login,
|
login: verto.options.login,
|
||||||
videoParams: verto.options.videoParams
|
videoParams: verto.options.videoParams
|
||||||
@ -1933,6 +1928,10 @@
|
|||||||
} else {
|
} else {
|
||||||
dialog.callID = dialog.params.callID = generateGUID();
|
dialog.callID = dialog.params.callID = generateGUID();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (typeof(dialog.params.tag) === "function") {
|
||||||
|
dialog.params.tag = dialog.params.tag();
|
||||||
|
}
|
||||||
|
|
||||||
if (dialog.params.tag) {
|
if (dialog.params.tag) {
|
||||||
dialog.audioStream = document.getElementById(dialog.params.tag);
|
dialog.audioStream = document.getElementById(dialog.params.tag);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user