Browse Source

Improve property name.

pull/242/head
Evan Theurer 10 years ago
parent
commit
aad06525c3
  1. 4
      static/js/controllers/appcontroller.js
  2. 2
      static/js/directives/settings.js
  3. 2
      static/js/services/turnsettings.js
  4. 6
      static/partials/settings.html

4
static/js/controllers/appcontroller.js

@ -56,8 +56,8 @@ define(["jquery", "angular", "underscore"], function($, angular, _) { @@ -56,8 +56,8 @@ define(["jquery", "angular", "underscore"], function($, angular, _) {
videoLeakyBucket: true,
videoNoiseReduction: false
},
webrtc: {
turn: {
turn: {
clientSideTurn: {
urls: [],
username: '',
password: ''

2
static/js/directives/settings.js

@ -91,7 +91,7 @@ define(['jquery', 'underscore', 'text!partials/settings.html'], function($, _, t @@ -91,7 +91,7 @@ define(['jquery', 'underscore', 'text!partials/settings.html'], function($, _, t
if (form.$valid && form.$dirty) {
var user = $scope.user;
$scope.update(user);
turnSettings.update($scope.user.settings.webrtc.turn);
turnSettings.update($scope.user.settings.turn.clientSideTurn);
if ($scope.rememberSettings) {
userSettingsData.save(user);
localStorage.setItem("mediastream-language", user.settings.language || "");

2
static/js/services/turnsettings.js

@ -50,7 +50,7 @@ define([], function() { @@ -50,7 +50,7 @@ define([], function() {
// Overwrite server Turn settings with user settings when loading app
appData.e.one("userSettingsLoaded", function(event, loadedUser, user) {
if (user) {
updateTurnSettings(user.settings.webrtc.turn);
updateTurnSettings(user.settings.turn.clientSideTurn);
}
});
// Get server site TURN settings

6
static/partials/settings.html

@ -289,20 +289,20 @@ @@ -289,20 +289,20 @@
<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" placeholder="turn:turnserver:port?transport=udp"/>
<input class="form-control" type="text" ng-model="user.settings.turn.clientSideTurn.urls" placeholder="turn:turnserver:port?transport=udp"/>
<span class="help-block">{{_('Comma separated list of urls')}}</span>
</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" placeholder="{{_('username')}}"/>
<input class="form-control" type="text" ng-model="user.settings.turn.clientSideTurn.username" placeholder="{{_('username')}}"/>
</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" placeholder="{{_('password')}}"/>
<input class="form-control" type="text" ng-model="user.settings.turn.clientSideTurn.password" placeholder="{{_('password')}}"/>
</div>
</div>
</div>

Loading…
Cancel
Save