octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-01-03 15:17:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2062 from canton7/feature/issue-2041

Browse Source 
Allow #editIgnores to scroll in browser (fixes #2041)
This commit is contained in:
Audrius Butkevicius 2015-07-15 17:48:15 +01:00
commit 00bebc317e
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gui/scripts/syncthing/core/controllers/syncthingController.js
View File

@ -1230,18 +1230,20 @@ angular.module('syncthing.core')
.success(function (data) { .success(function (data) {
data.ignore = data.ignore || []; data.ignore = data.ignore || [];
$('#editFolder').modal('hide'); $('#editFolder').modal('hide')
.one('hidden.bs.modal', function() {
var textArea = $('#editIgnores textarea'); var textArea = $('#editIgnores textarea');
textArea.val(data.ignore.join('\n')); textArea.val(data.ignore.join('\n'));
$('#editIgnores').modal() $('#editIgnores').modal()
.on('hidden.bs.modal', function () { .one('hidden.bs.modal', function () {
$('#editFolder').modal(); $('#editFolder').modal();
}) })
.on('shown.bs.modal', function () { .one('shown.bs.modal', function () {
textArea.focus(); textArea.focus();
}); });
});
}) })
.then(function () { .then(function () {
$('#editIgnoresButton').removeAttr('disabled'); $('#editIgnoresButton').removeAttr('disabled');