Просмотр исходного кода

Allow #urPreview to scroll in the browser (fixes #2537)

This is the same issue as #2014/#2062. Bootstrap doesn't like having two dialogs
open at once: it marks the body has having no dialogs open when the first dialog
is closed, regardless of whether the second dialog is still open.

This means that scrolling doesn't happen properly, and the user cannot
scroll to the dialog's 'close' button.

Work around this by making sure the first dialog (the settings page) is fully closed
before the second dialog (usage preview) is opened.
Antony Male 10 лет назад
Родитель
Сommit
4bd0dd2123
2 измененных файлов с 8 добавлено и 5 удалено
  1. 7 4
      gui/syncthing/core/syncthingController.js
  2. 1 1
      lib/auto/gui.files.go

+ 7 - 4
gui/syncthing/core/syncthingController.js

@@ -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 () {

Разница между файлами не показана из-за своего большого размера
+ 1 - 1
lib/auto/gui.files.go


Некоторые файлы не были показаны из-за большого количества измененных файлов