Browse Source

Add support for adding a custom turn server under settings.

pull/242/head
Evan Theurer 11 years ago
parent
commit
dfd337de77
  1. 7
      static/js/controllers/appcontroller.js
  2. 15
      static/js/directives/settings.js
  3. 21
      static/partials/settings.html

7
static/js/controllers/appcontroller.js

@ -56,6 +56,13 @@ define(["jquery", "angular", "underscore"], function($, angular, _) {
videoLeakyBucket: true, videoLeakyBucket: true,
videoNoiseReduction: false videoNoiseReduction: false
}, },
webrtc: {
turn: {
urls: ['turn:turnserver:port?transport=udp', 'turn:turnserver:port?transport=tcp'],
username: 'myusername',
password: 'the-default-turn-secret-do-not-keep'
}
},
sound: { sound: {
incomingMessages: true, incomingMessages: true,
incomingCall: true, incomingCall: true,

15
static/js/directives/settings.js

@ -70,6 +70,18 @@ define(['jquery', 'underscore', 'text!partials/settings.html'], function($, _, t
$scope.withUsers = mediaStream.config.UsersEnabled; $scope.withUsers = mediaStream.config.UsersEnabled;
$scope.withUsersRegistration = mediaStream.config.UsersAllowRegistration; $scope.withUsersRegistration = mediaStream.config.UsersAllowRegistration;
$scope.withUsersMode = mediaStream.config.UsersMode; $scope.withUsersMode = mediaStream.config.UsersMode;
$scope.withTurnCustomizable = mediaStream.config.TurnURIsClientSideSetable;
var updateTurnSettings = function() {
constraints.turn($scope.user.settings.webrtc.turn);
};
if ($scope.withTurnCustomizable && $scope.user.settings.webrtc.turn.urls) {
// Overwrite server Turn settings
appData.e.one("userSettingsLoaded", function() {
updateTurnSettings();
});
}
_.each(availableLanguages, function(name, code) { _.each(availableLanguages, function(name, code) {
$scope.availableLanguages.push({ $scope.availableLanguages.push({
@ -90,6 +102,9 @@ define(['jquery', 'underscore', 'text!partials/settings.html'], function($, _, t
if (form.$valid && form.$dirty) { if (form.$valid && form.$dirty) {
var user = $scope.user; var user = $scope.user;
$scope.update(user); $scope.update(user);
if ($scope.withTurnCustomizable) {
updateTurnSettings();
}
if ($scope.rememberSettings) { if ($scope.rememberSettings) {
userSettingsData.save(user); userSettingsData.save(user);
localStorage.setItem("mediastream-language", user.settings.language || ""); localStorage.setItem("mediastream-language", user.settings.language || "");

21
static/partials/settings.html

@ -283,6 +283,27 @@
</div> </div>
</div> </div>
<div ng-show="withTurnCustomizable">
<div class="form-group">
<label class="col-xs-4 control-label">{{_('Turn urls')}}</label>
<div class="col-xs-8">
<input class="form-control" type="text" ng-model="user.settings.webrtc.turn.urls"/>&nbsp;
</div>
</div>
<div class="form-group">
<label class="col-xs-4 control-label">{{_('Turn username')}}</label>
<div class="col-xs-8">
<input class="form-control" type="text" ng-model="user.settings.webrtc.turn.username"/>&nbsp;
</div>
</div>
<div class="form-group">
<label class="col-xs-4 control-label">{{_('Turn password')}}</label>
<div class="col-xs-8">
<input class="form-control" type="text" ng-model="user.settings.webrtc.turn.password"/>&nbsp;
</div>
</div>
</div>
</div> </div>
<settings-advanced-extra settings-advanced-extra></settings-advanced-extra> <settings-advanced-extra settings-advanced-extra></settings-advanced-extra>

Loading…
Cancel
Save