]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge pull request #1544 in FS/freeswitch from ~THEHUNMONKGROUP/freeswitch:bugfix...
authorChristopher Rienzo <chris@signalwire.com>
Tue, 28 Aug 2018 13:05:53 +0000 (13:05 +0000)
committerChristopher Rienzo <chris@signalwire.com>
Tue, 28 Aug 2018 13:05:53 +0000 (13:05 +0000)
* commit '36d9f7bc5e4a1644cdcf8c00df976d5283885ea3':
  FS-11280: Allow overriding permissionCallback per Verto dialog

1  2 
html5/verto/js/src/jquery.verto.js

index 43e76e4b2dc3ef0e6eed4c990f0badf04da745b4,5db7951d7846f1e2071a36a690bb2a48248541d7..9b920151cd2572d5761f70b03de76974a63c552e
              console.log("stream started");
          };
  
 +        RTCcallbacks.onRemoteStream = function(rtc, stream) {
 +          if (typeof dialog.callbacks.onRemoteStream === 'function') {
 +            dialog.callbacks.onRemoteStream(stream, dialog);
 +          }
 +          console.log("remote stream started");
 +        };
 +
          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'){
                  dialog.verto.options.permissionCallback.onDenied();
              }