perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add relaying to main settings dialog (fixes #2433)

Browse Source
This commit is contained in:
Jakob Borg
2016-01-05 09:48:38 +01:00
parent 400bfe9251
commit 1df924f4f8
3 changed files with 53 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gui/syncthing/core/syncthingController.js
View File

@@ -353,6 +353,7 @@ angular.module('syncthing.core')
$scope.config = config;
$scope.config.options._listenAddressStr = $scope.config.options.listenAddress.join(', ');
$scope.config.options._globalAnnounceServersStr = $scope.config.options.globalAnnounceServers.join(', ');
$scope.config.options._relayServersStr = $scope.config.options.relayServers.join(', ');
$scope.devices = $scope.config.devices;
$scope.devices.forEach(function (deviceCfg) {
@@ -890,7 +891,7 @@ angular.module('syncthing.core')
$scope.config.options = angular.copy($scope.tmpOptions);
$scope.config.gui = angular.copy($scope.tmpGUI);
['listenAddress', 'globalAnnounceServers'].forEach(function (key) {
['listenAddress', 'globalAnnounceServers', 'relayServers'].forEach(function (key) {
$scope.config.options[key] = $scope.config.options["_" + key + "Str"].split(/[ ,]+/).map(function (x) {
return x.trim();
});