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

gui: Reset warnings about nested folder roots (fixes #3433)

Browse Source 
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4173
This commit is contained in:
Simon Frei
2017-05-23 19:54:56 +00:00
committed by Audrius Butkevicius
parent 91d37f35bc
commit dd6bb6d5fd
3 changed files with 34 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
gui/default/syncthing/core/syncthingController.js
View File

@@ -53,27 +53,28 @@ angular.module('syncthing.core')
$scope.themes = [];
$scope.globalChangeEvents = {};
$scope.metricRates = false;
$scope.folderPathErrors = {};
try {
$scope.metricRates = (window.localStorage["metricRates"] == "true");
} catch (exception) { }
$scope.folderDefaults = {
selectedDevices: {},
type: "readwrite",
rescanIntervalS: 60,
minDiskFree: {value: 1, unit: "%"},
maxConflicts: 10,
fsync: true,
order: "random",
fileVersioningSelector: "none",
trashcanClean: 0,
simpleKeep: 5,
staggeredMaxAge: 365,
staggeredCleanInterval: 3600,
staggeredVersionsPath: "",
externalCommand: "",
autoNormalize: true
selectedDevices: {},
type: "readwrite",
rescanIntervalS: 60,
minDiskFree: {value: 1, unit: "%"},
maxConflicts: 10,
fsync: true,
order: "random",
fileVersioningSelector: "none",
trashcanClean: 0,
simpleKeep: 5,
staggeredMaxAge: 365,
staggeredCleanInterval: 3600,
staggeredVersionsPath: "",
externalCommand: "",
autoNormalize: true
};
$scope.localStateTotal = {
@@ -1409,6 +1410,7 @@ angular.module('syncthing.core')
$scope.currentFolder.externalCommand = $scope.currentFolder.externalCommand || "";
$scope.editingExisting = true;
$scope.folderPathErrors = {};
$scope.folderEditor.$setPristine();
$('#editFolder').modal();
};
@@ -1417,6 +1419,7 @@ angular.module('syncthing.core')
$scope.currentFolder = angular.copy($scope.folderDefaults);
$scope.editingExisting = false;
$('#editIgnores textarea').val("");
$scope.folderPathErrors = {};
$scope.folderEditor.$setPristine();
$http.get(urlbase + '/svc/random/string?length=10').success(function (data) {
$scope.currentFolder.id = (data.random.substr(0, 5) + '-' + data.random.substr(5, 5)).toLowerCase();
@@ -1435,6 +1438,7 @@ angular.module('syncthing.core')
$scope.currentFolder.selectedDevices[device] = true;
$scope.editingExisting = false;
$scope.folderPathErrors = {};
$scope.folderEditor.$setPristine();
$('#editFolder').modal();
};