Browse Source

Don't start ringer / pickup timeout in conference rooms.

This is a followup to #378, thanks @karlitschek for reporting.
pull/400/head
Joachim Bauch 10 years ago
parent
commit
8d74421b10
Failed to extract signature
  1. 2
      static/js/controllers/uicontroller.js

2
static/js/controllers/uicontroller.js

@ -757,7 +757,7 @@ define(['jquery', 'underscore', 'bigscreen', 'moment', 'sjcl', 'modernizr', 'tex @@ -757,7 +757,7 @@ define(['jquery', 'underscore', 'bigscreen', 'moment', 'sjcl', 'modernizr', 'tex
});
$scope.$on("status", function(event, status) {
if (status === "connecting" && dialerEnabled) {
if (status === "connecting" && dialerEnabled && !$scope.isConferenceRoom()) {
dialer.start();
// Start accept timeout.
ringerTimeout = $timeout(function() {

Loading…
Cancel
Save