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

review & forgotten fixes from other PR

Browse Source
This commit is contained in:
Simon Frei
2018-03-18 01:42:31 +01:00
committed by Audrius Butkevicius
parent ae74ac8329
commit 81bd428b25
5 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,7 @@ angular.module('syncthing.core')
.config(function($locationProvider) {
$locationProvider.html5Mode({enabled: true, requireBase: false}).hashPrefix('!');
})
.controller('SyncthingController', function ($scope, $http, $location, LocaleService, Events, $filter, $q, $compile, $timeout, $rootScope) {
.controller('SyncthingController', function ($scope, $http, $location, LocaleService, Events, $filter, $q, $compile, $timeout, $rootScope, $translate) {
'use strict';
// private/helper definitions
@@ -715,7 +715,6 @@ angular.module('syncthing.core')
$http.get(urlbase + "/events/disk?limit=25").success(function (data) {
data = data.reverse();
$scope.globalChangeEvents = data;
console.log("refreshGlobalChanges", data);
}).error($scope.emitHTTPError);
}, 2500);
@@ -1580,15 +1579,17 @@ angular.module('syncthing.core')
}
$scope.currentFolder.externalCommand = $scope.currentFolder.externalCommand || "";
$('#folder-ignores textarea').val("");
$('#folder-ignores textarea').val($translate.instant("Loading..."));
$('#folder-ignores textarea').attr('disabled', 'disabled');
$http.get(urlbase + '/db/ignores?folder=' + encodeURIComponent($scope.currentFolder.id))
.success(function (data) {
$scope.currentFolder.ignores = data.ignore || [];
$('#folder-ignores textarea').val($scope.currentFolder.ignores.join('\n'));
})
.then(function () {
$('#folder-ignores textarea').removeAttr('disabled');
})
.error(function (err) {
$('#folder-ignores textarea').val($translate.instant("Failed to load ignore patterns."));
$scope.emitHTTPError(err);
});
$scope.editFolderModal();
@@ -1711,7 +1712,6 @@ angular.module('syncthing.core')
});
}
});
};
$scope.dismissFolderRejection = function (folder, device) {