From 5541697d18195e1d55c230b02094786fd1af4ac6 Mon Sep 17 00:00:00 2001 From: Simon Frei Date: Wed, 5 Jun 2019 08:03:53 +0200 Subject: [PATCH] gui: Don't call API when no modal is open (fixes #5652) (#5759) --- .../syncthing/core/syncthingController.js | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/gui/default/syncthing/core/syncthingController.js b/gui/default/syncthing/core/syncthingController.js index 44ea33a7a..9aef028ae 100755 --- a/gui/default/syncthing/core/syncthingController.js +++ b/gui/default/syncthing/core/syncthingController.js @@ -561,6 +561,9 @@ angular.module('syncthing.core') } function refreshNeed(folder) { + if (!$scope.neededFolder) { + return; + } var url = urlbase + "/db/need?folder=" + encodeURIComponent(folder); url += "&page=" + $scope.neededCurrentPage; url += "&perpage=" + $scope.neededPageSize; @@ -653,6 +656,9 @@ angular.module('syncthing.core') }; $scope.refreshFailed = function (page, perpage) { + if (!$scope.failed) { + return; + } var url = urlbase + '/folder/errors?folder=' + encodeURIComponent($scope.failed.folder); url += "&page=" + page + "&perpage=" + perpage; $http.get(url).success(function (data) { @@ -661,13 +667,14 @@ angular.module('syncthing.core') }; $scope.refreshRemoteNeed = function (folder, page, perpage) { + if (!$scope.remoteNeedDevice) { + return; + } var url = urlbase + '/db/remoteneed?device=' + $scope.remoteNeedDevice.deviceID; url += '&folder=' + encodeURIComponent(folder); url += "&page=" + page + "&perpage=" + perpage; $http.get(url).success(function (data) { - if ($scope.remoteNeedDevice !== '') { - $scope.remoteNeed[folder] = data; - } + $scope.remoteNeed[folder] = data; }).error(function (err) { $scope.remoteNeed[folder] = undefined; $scope.emitHTTPError(err); @@ -675,6 +682,9 @@ angular.module('syncthing.core') }; $scope.refreshLocalChanged = function (page, perpage) { + if (!$scope.localChangedFolder) { + return; + } var url = urlbase + '/db/localchanged?folder='; url += encodeURIComponent($scope.localChangedFolder); url += "&page=" + page + "&perpage=" + perpage; @@ -2205,6 +2215,7 @@ angular.module('syncthing.core') $scope.localChanged = $scope.refreshLocalChanged(1, 10); $('#localChanged').modal().one('hidden.bs.modal', function () { $scope.localChanged = {}; + $scope.localChangedFolder = undefined; }); };