octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-02-11 00:08:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #255 from KayoticSully/master

Browse Source 
Resolves Issue #239
This commit is contained in:
Jakob Borg 2014-05-21 22:21:33 +02:00
commit b3ca96eeba
4 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -5,3 +5,5 @@ stcli.exe
*.tar.gz *.tar.gz
*.zip *.zip
*.asc *.asc
Godeps/
*.sublime*

4
auto/gui.files.go
View File

File diff suppressed because one or more lines are too long

18
gui/app.js
View File

@ -254,13 +254,25 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http) {
}; };
$scope.editSettings = function () { $scope.editSettings = function () {
// Make a working copy
$scope.config.workingOptions = angular.copy($scope.config.Options);
$scope.config.workingGUI = angular.copy($scope.config.GUI);
$('#settings').modal({backdrop: 'static', keyboard: true}); $('#settings').modal({backdrop: 'static', keyboard: true});
} }
$scope.saveSettings = function () { $scope.saveSettings = function () {
$scope.configInSync = false; // Make sure something changed
$scope.config.Options.ListenAddress = $scope.config.Options.ListenStr.split(',').map(function (x) { return x.trim(); }); var changed = ! angular.equals($scope.config.Options, $scope.config.workingOptions) ||
$http.post(urlbase + '/config', JSON.stringify($scope.config), {headers: {'Content-Type': 'application/json'}}); ! angular.equals($scope.config.GUI, $scope.config.workingGUI);
if(changed){
$scope.config.Options = angular.copy($scope.config.workingOptions);
$scope.config.GUI = angular.copy($scope.config.workingGUI);
$scope.configInSync = false;
$scope.config.Options.ListenAddress = $scope.config.Options.ListenStr.split(',').map(function (x) { return x.trim(); });
$http.post(urlbase + '/config', JSON.stringify($scope.config), {headers: {'Content-Type': 'application/json'}});
}
$('#settings').modal("hide"); $('#settings').modal("hide");
}; };

8
gui/index.html
View File

@ -515,11 +515,11 @@
<div class="form-group" ng-repeat="setting in settings"> <div class="form-group" ng-repeat="setting in settings">
<div ng-if="setting.type == 'text' || setting.type == 'number'"> <div ng-if="setting.type == 'text' || setting.type == 'number'">
<label for="{{setting.id}}">{{setting.descr}}</label> <label for="{{setting.id}}">{{setting.descr}}</label>
<input id="{{setting.id}}" class="form-control" type="{{setting.type}}" ng-model="config.Options[setting.id]"></input> <input id="{{setting.id}}" class="form-control" type="{{setting.type}}" ng-model="config.workingOptions[setting.id]"></input>
</div> </div>
<div class="checkbox" ng-if="setting.type == 'bool'"> <div class="checkbox" ng-if="setting.type == 'bool'">
<label> <label>
{{setting.descr}} <input id="{{setting.id}}" type="checkbox" ng-model="config.Options[setting.id]"></input> {{setting.descr}} <input id="{{setting.id}}" type="checkbox" ng-model="config.workingOptions[setting.id]"></input>
</label> </label>
</div> </div>
</div> </div>
@ -528,11 +528,11 @@
<div class="form-group" ng-repeat="setting in guiSettings"> <div class="form-group" ng-repeat="setting in guiSettings">
<div ng-if="setting.type == 'text' || setting.type == 'number' || setting.type == 'password'"> <div ng-if="setting.type == 'text' || setting.type == 'number' || setting.type == 'password'">
<label for="{{setting.id}}">{{setting.descr}}</label> <label for="{{setting.id}}">{{setting.descr}}</label>
<input id="{{setting.id}}" class="form-control" type="{{setting.type}}" ng-model="config.GUI[setting.id]"></input> <input id="{{setting.id}}" class="form-control" type="{{setting.type}}" ng-model="config.workingGUI[setting.id]"></input>
</div> </div>
<div class="checkbox" ng-if="setting.type == 'bool'"> <div class="checkbox" ng-if="setting.type == 'bool'">
<label> <label>
{{setting.descr}} <input id="{{setting.id}}" type="checkbox" ng-model="config.GUI[setting.id]"></input> {{setting.descr}} <input id="{{setting.id}}" type="checkbox" ng-model="config.workingGUI[setting.id]"></input>
</label> </label>
</div> </div>
</div> </div>