kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1544 in FS/freeswitch from ~THEHUNMONKGROUP/freeswitch:bugfix/FS-11280-allow-overriding-permissioncallback to master 

* commit '36d9f7bc5e4a1644cdcf8c00df976d5283885ea3':
  FS-11280: Allow overriding permissionCallback per Verto dialog
This commit is contained in:
Christopher Rienzo 2018-08-28 13:05:53 +00:00
parent 22d022ab4a 36d9f7bc5e
commit abca94578b
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
html5/verto/js/src/jquery.verto.js
View File

@ -2055,7 +2055,11 @@
}; };
RTCcallbacks.onStream = function(rtc, stream) { RTCcallbacks.onStream = function(rtc, stream) {
if (dialog.verto.options.permissionCallback && if (dialog.callbacks.permissionCallback &&
typeof dialog.callbacks.permissionCallback.onGranted === 'function') {
dialog.callbacks.permissionCallback.onGranted(stream);
}
else if (dialog.verto.options.permissionCallback &&
typeof dialog.verto.options.permissionCallback.onGranted === 'function'){ typeof dialog.verto.options.permissionCallback.onGranted === 'function'){
dialog.verto.options.permissionCallback.onGranted(stream); dialog.verto.options.permissionCallback.onGranted(stream);
} }
@ -2070,7 +2074,11 @@
}; };
RTCcallbacks.onError = function(e) { RTCcallbacks.onError = function(e) {
if (dialog.verto.options.permissionCallback && if (dialog.callbacks.permissionCallback &&
typeof dialog.callbacks.permissionCallback.onDenied === 'function') {
dialog.callbacks.permissionCallback.onDenied();
}
else if (dialog.verto.options.permissionCallback &&
typeof dialog.verto.options.permissionCallback.onDenied === 'function'){ typeof dialog.verto.options.permissionCallback.onDenied === 'function'){
dialog.verto.options.permissionCallback.onDenied(); dialog.verto.options.permissionCallback.onDenied();
} }