Martchus
/
syncthing
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2538 from canton7/feature/issue-2537 

Allow #urPreview to scroll in the browser (fixes #2537)
This commit is contained in:
Audrius Butkevicius 2015-11-30 13:36:28 +00:00
parent 9b2a643626 4bd0dd2123
commit 45535c0f5a
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1414,10 +1414,13 @@ angular.module('syncthing.core')
};
$scope.showURPreview = function () {
$('#settings').modal('hide');
$('#urPreview').modal().on('hidden.bs.modal', function () {
$('#settings').modal();
});
$('#settings').modal('hide')
.one('hidden.bs.modal', function() {
$('#urPreview').modal()
.one('hidden.bs.modal', function () {
$('#settings').modal();
});
});
};
$scope.acceptUR = function () {

4
lib/auto/gui.files.go
View File

File diff suppressed because one or more lines are too long