octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-01-06 08:40:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

gui: Semicolon insertion (#5666)

Browse Source
This commit is contained in:
Jonas Thelemann 2019-04-23 19:37:51 +02:00 committed by Audrius Butkevicius
parent d3d43d90f6
commit d9b3415dec
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gui/default/syncthing/app.js
View File

@ -179,7 +179,7 @@ function buildTree(children) {
key: keySoFar.join('/'), key: keySoFar.join('/'),
folder: true, folder: true,
children: [] children: []
} };
parent.children.push(child); parent.children.push(child);
parent = child; parent = child;
} }
@ -209,7 +209,7 @@ function unitPrefixed(input, binary) {
var i = ''; var i = '';
if (binary) { if (binary) {
factor = 1024; factor = 1024;
i = 'i' i = 'i';
} }
if (input > factor * factor * factor * factor * 1000) { if (input > factor * factor * factor * factor * 1000) {
// Don't show any decimals for more than 4 digits // Don't show any decimals for more than 4 digits

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

@ -479,7 +479,7 @@ angular.module('syncthing.core')
$scope.completion[device]._needItems = 0; $scope.completion[device]._needItems = 0;
} else { } else {
$scope.completion[device]._total = Math.floor(100 * (1 - needed / total)); $scope.completion[device]._total = Math.floor(100 * (1 - needed / total));
$scope.completion[device]._needBytes = needed $scope.completion[device]._needBytes = needed;
$scope.completion[device]._needItems = items + deletes; $scope.completion[device]._needItems = items + deletes;
} }
@ -1172,7 +1172,7 @@ angular.module('syncthing.core')
} }
}); });
} }
} };
$scope.editSettings = function () { $scope.editSettings = function () {
// Make a working copy // Make a working copy
@ -1253,7 +1253,7 @@ angular.module('syncthing.core')
var ignoredFoldersEquals = angular.equals($scope.config.devices, $scope.tmpDevices); var ignoredFoldersEquals = angular.equals($scope.config.devices, $scope.tmpDevices);
console.log("settings equals - options: " + optionsEqual + " gui: " + guiEquals + " ignDev: " + ignoredDevicesEquals + " ignFol: " + ignoredFoldersEquals); console.log("settings equals - options: " + optionsEqual + " gui: " + guiEquals + " ignDev: " + ignoredDevicesEquals + " ignFol: " + ignoredFoldersEquals);
return !optionsEqual || !guiEquals || !ignoredDevicesEquals || !ignoredFoldersEquals; return !optionsEqual || !guiEquals || !ignoredDevicesEquals || !ignoredFoldersEquals;
} };
$scope.saveSettings = function () { $scope.saveSettings = function () {
// Make sure something changed // Make sure something changed
@ -1534,7 +1534,7 @@ angular.module('syncthing.core')
$scope.thisDevice = function () { $scope.thisDevice = function () {
return $scope.thisDeviceIn($scope.devices); return $scope.thisDeviceIn($scope.devices);
} };
$scope.thisDeviceIn = function (l) { $scope.thisDeviceIn = function (l) {
for (var i = 0; i < l.length; i++) { for (var i = 0; i < l.length; i++) {
@ -1573,7 +1573,7 @@ angular.module('syncthing.core')
} }
}); });
return errs; return errs;
} };
$scope.friendlyDevices = function (str) { $scope.friendlyDevices = function (str) {
for (var i = 0; i < $scope.devices.length; i++) { for (var i = 0; i < $scope.devices.length; i++) {
@ -1888,7 +1888,7 @@ angular.module('syncthing.core')
} }
var label = $scope.folders[folderID].label; var label = $scope.folders[folderID].label;
return label && label.length > 0 ? label : folderID; return label && label.length > 0 ? label : folderID;
} };
$scope.deleteFolder = function (id) { $scope.deleteFolder = function (id) {
$('#editFolder').modal('hide'); $('#editFolder').modal('hide');