perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gui: Show 'scanning' on unshared folders (fixes #3068)

Browse Source 
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3239
This commit is contained in:
Daniel Harte 2016-06-02 00:17:48 +00:00 committed by Audrius Butkevicius
parent ee398f17e1
commit f792989d9b
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -606,10 +606,6 @@ angular.module('syncthing.core')
return 'unknown'; return 'unknown';
} }
if (folderCfg.devices.length <= 1) {
return 'unshared';
}
if ($scope.model[folderCfg.id].invalid) { if ($scope.model[folderCfg.id].invalid) {
return 'stopped'; return 'stopped';
} }
@ -621,6 +617,13 @@ angular.module('syncthing.core')
if (state === 'idle' && $scope.model[folderCfg.id].needFiles > 0) { if (state === 'idle' && $scope.model[folderCfg.id].needFiles > 0) {
return 'outofsync'; return 'outofsync';
} }
if (state === 'scanning') {
return state;
}
if (folderCfg.devices.length <= 1) {
return 'unshared';
}
return state; return state;
}; };