Merge pull request #1241 from syncthing/fix-1143

Don't start a new refresh() loop on each UIOnline (fixes #1143)
This commit is contained in:
Audrius Butkevicius 2015-01-12 11:29:53 +00:00
commit a2548b1fd0
2 changed files with 22 additions and 23 deletions

View File

@ -11,27 +11,6 @@ angular.module('syncthing.core')
function initController() { function initController() {
LocaleService.autoConfigLocale(); LocaleService.autoConfigLocale();
refreshSystem();
refreshConfig();
refreshConnectionStats();
refreshDeviceStats();
refreshFolderStats();
$http.get(urlbase + '/version').success(function (data) {
$scope.version = data.version;
}).error($scope.emitHTTPError);
$http.get(urlbase + '/report').success(function (data) {
$scope.reportData = data;
}).error($scope.emitHTTPError);
$http.get(urlbase + '/upgrade').success(function (data) {
$scope.upgradeInfo = data;
}).error(function () {
$scope.upgradeInfo = null;
});
setInterval($scope.refresh, 10000); setInterval($scope.refresh, 10000);
} }
@ -85,7 +64,27 @@ angular.module('syncthing.core')
} }
console.log('UIOnline'); console.log('UIOnline');
initController();
refreshSystem();
refreshConfig();
refreshConnectionStats();
refreshDeviceStats();
refreshFolderStats();
$http.get(urlbase + '/version').success(function (data) {
$scope.version = data.version;
}).error($scope.emitHTTPError);
$http.get(urlbase + '/report').success(function (data) {
$scope.reportData = data;
}).error($scope.emitHTTPError);
$http.get(urlbase + '/upgrade').success(function (data) {
$scope.upgradeInfo = data;
}).error(function () {
$scope.upgradeInfo = null;
});
online = true; online = true;
restarting = false; restarting = false;
$('#networkError').modal('hide'); $('#networkError').modal('hide');

File diff suppressed because one or more lines are too long