diff --git a/gui/default/index.html b/gui/default/index.html index fb7d644b..e49d8ffc 100644 --- a/gui/default/index.html +++ b/gui/default/index.html @@ -750,7 +750,6 @@ - diff --git a/gui/default/syncthing/core/syncthingController.js b/gui/default/syncthing/core/syncthingController.js index 3bbc9cf4..22e239e2 100755 --- a/gui/default/syncthing/core/syncthingController.js +++ b/gui/default/syncthing/core/syncthingController.js @@ -637,6 +637,16 @@ angular.module('syncthing.core') $scope.remoteNeedDevice = undefined; } + function saveIgnores(ignores, cb) { + $http.post(urlbase + '/db/ignores?folder=' + encodeURIComponent($scope.currentFolder.id), { + ignore: ignores + }).success(function () { + if (cb) { + cb(); + } + }); + }; + $scope.neededPageChanged = function (page) { $scope.neededCurrentPage = page; refreshNeed($scope.neededFolder); @@ -1150,7 +1160,9 @@ angular.module('syncthing.core') $scope.tmpOptions.upgrades = "candidate"; } $scope.tmpGUI = angular.copy($scope.config.gui); - $('#settings').modal(); + $('#settings').modal().on('hidden.bs.modal', function () { + window.location.hash = ""; + }); }; $scope.saveConfig = function (cb) { @@ -1512,8 +1524,16 @@ angular.module('syncthing.core') $scope.editFolderModal = function () { $scope.folderPathErrors = {}; $scope.folderEditor.$setPristine(); - $('#editIgnores textarea').val(""); - $('#editFolder').modal(); + $('#editFolder').modal().on({ + 'shown.bs.tab': function (e) { + if (e.target.attributes.href.value === "#folder-ignores") { + $('#folder-ignores textarea').focus(); + } + }, + 'hidden.bs.modal': function () { + window.location.hash = ""; + } + }); }; $scope.editFolder = function (folderCfg) { @@ -1560,6 +1580,17 @@ angular.module('syncthing.core') } $scope.currentFolder.externalCommand = $scope.currentFolder.externalCommand || ""; + $('#folder-ignores textarea').val(""); + $('#folder-ignores textarea').attr('disabled', 'disabled'); + $http.get(urlbase + '/db/ignores?folder=' + encodeURIComponent($scope.currentFolder.id)) + .success(function (data) { + $scope.currentFolder.ignores = data.ignore || []; + $('#folder-ignores textarea').val($scope.currentFolder.ignores.join('\n')); + }) + .then(function () { + $('#folder-ignores textarea').removeAttr('disabled'); + }); + $scope.editFolderModal(); }; @@ -1568,6 +1599,8 @@ angular.module('syncthing.core') $scope.editingExisting = false; $scope.currentFolder = angular.copy($scope.folderDefaults); $scope.currentFolder.id = (data.random.substr(0, 5) + '-' + data.random.substr(5, 5)).toLowerCase(); + $('#folder-ignores textarea').val(""); + $('#folder-ignores textarea').removeAttr('disabled'); $scope.editFolderModal(); }); }; @@ -1582,7 +1615,8 @@ angular.module('syncthing.core') importFromOtherDevice: true }; $scope.currentFolder.selectedDevices[device] = true; - + $('#folder-ignores textarea').val(""); + $('#folder-ignores textarea').removeAttr('disabled'); $scope.editFolderModal(); }; @@ -1654,21 +1688,30 @@ angular.module('syncthing.core') delete folderCfg.versioning; } - var ignores = $('#editIgnores textarea').val().trim(); - if (!$scope.editingExisting && ignores) { + var ignores = $('#folder-ignores textarea').val().split('\n'); + // Split always returns a minimum 1-length array even for no patterns + if (ignores.length === 1 && ignores[0] === "") { + ignores = []; + } + if (!$scope.editingExisting && ignores.length) { folderCfg.paused = true; }; $scope.folders[folderCfg.id] = folderCfg; $scope.config.folders = folderList($scope.folders); + if ($scope.editingExisting && ignores !== folderCfg.ignores) { + saveIgnores(ignores); + }; + $scope.saveConfig(function () { - if (!$scope.editingExisting && ignores) { - $scope.saveIgnores(function () { + if (!$scope.editingExisting && ignores.length) { + saveIgnores(ignores, function () { $scope.setFolderPause(folderCfg.id, false); }); } }); + }; $scope.dismissFolderRejection = function (folder, device) { @@ -1724,27 +1767,6 @@ angular.module('syncthing.core') $scope.saveConfig(); }; - $scope.editIgnores = function () { - if (!$scope.editingExisting) { - return; - } - - $('#editIgnoresButton').attr('disabled', 'disabled'); - $http.get(urlbase + '/db/ignores?folder=' + encodeURIComponent($scope.currentFolder.id)) - .success(function (data) { - data.ignore = data.ignore || []; - var textArea = $('#editIgnores textarea'); - textArea.val(data.ignore.join('\n')); - $('#editIgnores').modal() - .one('shown.bs.modal', function () { - textArea.focus(); - }); - }) - .then(function () { - $('#editIgnoresButton').removeAttr('disabled'); - }); - }; - function resetRestoreVersions() { $scope.restoreVersions = { folder: null, @@ -1972,30 +1994,6 @@ angular.module('syncthing.core') }); }); - $scope.editIgnoresOnAddingFolder = function () { - if ($scope.editingExisting) { - return; - } - - if ($scope.currentFolder.path.endsWith($scope.system.pathSeparator)) { - $scope.currentFolder.path = $scope.currentFolder.path.slice(0, -1); - }; - $('#editIgnores').modal().one('shown.bs.modal', function () { - textArea.focus(); - }); - }; - - - $scope.saveIgnores = function (cb) { - $http.post(urlbase + '/db/ignores?folder=' + encodeURIComponent($scope.currentFolder.id), { - ignore: $('#editIgnores textarea').val().split('\n') - }).success(function () { - if (cb) { - cb(); - } - }); - }; - $scope.setAPIKey = function (cfg) { $http.get(urlbase + '/svc/random/string?length=32').success(function (data) { cfg.apiKey = data.random; diff --git a/gui/default/syncthing/folder/editFolderModalView.html b/gui/default/syncthing/folder/editFolderModalView.html index cc2aab45..3e559baf 100644 --- a/gui/default/syncthing/folder/editFolderModalView.html +++ b/gui/default/syncthing/folder/editFolderModalView.html @@ -1,8 +1,14 @@
-
-
+ +
+
@@ -34,10 +40,6 @@ Warning, this path is a parent directory of an existing folder "{%otherFolderLabel%}" ({%otherFolder%}).

-
-
-
-

Select the devices to share this folder with.

@@ -51,138 +53,148 @@
+
When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.
-
-
When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.
-
-
- -
-
-
-
-
-
-
- -

- The rescan interval must be a non-negative number of seconds. -

-
+
+
+   Help +
-
-
-
-
-
-

- Enter a non-negative number (e.g., "2.35") and select a unit. Percentages are as part of the total disk size. -

+
+

Files are moved to .stversions directory when replaced or deleted by Syncthing.

+ +
+ +
days
+

+ The number of days to keep files in the trash can. Zero means forever. + The number of days must be a number and cannot be blank. + A negative number of days doesn't make sense. +

+
+
+

Files are moved to date stamped versions in a .stversions directory when replaced or deleted by Syncthing.

+ + +

+ The number of old versions to keep, per file. + The number of versions must be a number and cannot be blank. + You must keep at least one version. +

+
+
+

Files are moved to date stamped versions in a .stversions directory when replaced or deleted by Syncthing. Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.

+

The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.

+ + +

+ The maximum time to keep a version (in days, set to 0 to keep versions forever). + The maximum age must be a number and cannot be blank. + A negative number of days doesn't make sense. +

+
+
+ + +

Path where versions should be stored (leave empty for the default .stversions directory in the shared folder).

+
+
+

An external command handles the versioning. It has to remove the file from the shared folder. If the path to the application contains spaces, it should be quoted.

+ + +

+ See external versioning help for supported templated command line parameters. + The path cannot be blank. +

-
- -
-
- -   Help - -

Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.

-
-
-
- +
+

Enter ignore patterns, one per line.

+ +
+

Quick guide to supported patterns (full documentation):

+
+
(?d)
Prefix indicating that the file can be deleted if preventing directory removal
+
(?i)
Prefix indicating that the pattern should be matched without case sensitivity
+
!
Inversion of the given condition (i.e. do not exclude)
+
*
Single level wildcard (matches within a directory only)
+
**
Multi level wildcard (matches multiple directory levels)
+
//
Comment, when used at the start of a line
+
+
+
Editing {%path%}.
+
Creating ignore patterns, overwriting an existing file at {%path%}.
+
+
+
+
+
+
+ +

+ The rescan interval must be a non-negative number of seconds. +

+
+
+
+
+
+
+
+

+ Enter a non-negative number (e.g., "2.35") and select a unit. Percentages are as part of the total disk size. +

-

File permission bits are ignored when looking for changes. Use on FAT file systems.

+
+ +
+
+ +   Help + +

Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.

+
+
+
+ +
+

File permission bits are ignored when looking for changes. Use on FAT file systems.

+
+
- -
-
- - -
-
-   Help - -
-
-

Files are moved to .stversions directory when replaced or deleted by Syncthing.

- -
- -
days
+ +
+
+ +
-

- The number of days to keep files in the trash can. Zero means forever. - The number of days must be a number and cannot be blank. - A negative number of days doesn't make sense. -

-
-
-

Files are moved to date stamped versions in a .stversions directory when replaced or deleted by Syncthing.

- - -

- The number of old versions to keep, per file. - The number of versions must be a number and cannot be blank. - You must keep at least one version. -

-
-
-

Files are moved to date stamped versions in a .stversions directory when replaced or deleted by Syncthing. Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.

-

The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.

- - -

- The maximum time to keep a version (in days, set to 0 to keep versions forever). - The maximum age must be a number and cannot be blank. - A negative number of days doesn't make sense. -

-
-
- - -

Path where versions should be stored (leave empty for the default .stversions directory in the shared folder).

-
-
-

An external command handles the versioning. It has to remove the file from the shared folder. If the path to the application contains spaces, it should be quoted.

- - -

- See external versioning help for supported templated command line parameters. - The path cannot be blank. -

@@ -193,9 +205,6 @@ - diff --git a/gui/default/syncthing/folder/editIgnoresModalView.html b/gui/default/syncthing/folder/editIgnoresModalView.html deleted file mode 100644 index f5525f39..00000000 --- a/gui/default/syncthing/folder/editIgnoresModalView.html +++ /dev/null @@ -1,28 +0,0 @@ - -
-

Enter ignore patterns, one per line.

- - -
- -

Quick guide to supported patterns (full documentation):

-
-
(?d)
Prefix indicating that the file can be deleted if preventing directory removal
-
(?i)
Prefix indicating that the pattern should be matched without case sensitivity
-
!
Inversion of the given condition (i.e. do not exclude)
-
*
Single level wildcard (matches within a directory only)
-
**
Multi level wildcard (matches multiple directory levels)
-
//
Comment, when used at the start of a line
-
-
-
-
Editing {%path%}.
-
Creating ignore patterns, overwriting an existing file at {%path%}.
- - -
-