octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-12-23 03:18:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source 
Conflicts:
	auto/gui.files.go
This commit is contained in:
Ryan Sullivan 2014-05-21 15:15:37 -04:00
commit 63c0f11458
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
auto/gui.files.go
View File

File diff suppressed because one or more lines are too long

5
gui/app.js
View File

@ -234,6 +234,9 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http) {
}; };
$scope.nodeName = function (nodeCfg) { $scope.nodeName = function (nodeCfg) {
if (typeof nodeCfg === 'undefined') {
return "";
}
if (nodeCfg.Name) { if (nodeCfg.Name) {
return nodeCfg.Name; return nodeCfg.Name;
} }
@ -314,7 +317,7 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http) {
}); });
$scope.config.Nodes = $scope.nodes; $scope.config.Nodes = $scope.nodes;
for (var id in repos) { for (var id in $scope.repos) {
$scope.repos[id].Nodes = $scope.repos[id].Nodes.filter(function (n) { $scope.repos[id].Nodes = $scope.repos[id].Nodes.filter(function (n) {
return n.NodeID !== $scope.currentNode.NodeID; return n.NodeID !== $scope.currentNode.NodeID;
}); });

2
gui/index.html
View File

@ -389,7 +389,7 @@
<div class="well well-sm text-monospace text-center"> <div class="well well-sm text-monospace text-center">
{{myID | chunkID}} {{myID | chunkID}}
</div> </div>
<img class="center-block img-thumbnail" src="qr/{{myID | chunkID}}"/> <img ng-if="myID" class="center-block img-thumbnail" src="qr/{{myID | chunkID}}"/>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><span class="glyphicon glyphicon-remove"></span>&emsp;Close</button> <button type="button" class="btn btn-default" data-dismiss="modal"><span class="glyphicon glyphicon-remove"></span>&emsp;Close</button>