octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-04-02 15:51:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Display alert on GUI connection error (fixes #26)

Browse Source
This commit is contained in:
Jakob Borg 2014-01-09 10:31:27 +01:00
parent 211180108e
commit 6d64992e64
2 changed files with 41 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gui/app.js
View File

@ -1,18 +1,36 @@
var syncthing = angular.module('syncthing', []); var syncthing = angular.module('syncthing', []);
syncthing.controller('SyncthingCtrl', function ($scope, $http) { syncthing.controller('SyncthingCtrl', function ($scope, $http) {
var prevDate = 0;
var modelGetOK = true;
function modelGetSucceeded() {
if (!modelGetOK) {
$('#networkError').modal('hide');
modelGetOK = true;
}
}
function modelGetFailed() {
if (modelGetOK) {
$('#networkError').modal({backdrop: 'static', keyboard: false});
modelGetOK = false;
}
}
$http.get("/rest/version").success(function (data) { $http.get("/rest/version").success(function (data) {
$scope.version = data; $scope.version = data;
}); });
$http.get("/rest/config").success(function (data) { $http.get("/rest/config").success(function (data) {
$scope.config = data; $scope.config = data;
}); });
var prevDate = 0;
$scope.refresh = function () { $scope.refresh = function () {
$http.get("/rest/model").success(function (data) { $http.get("/rest/model").success(function (data) {
$scope.model = data; $scope.model = data;
modelGetSucceeded();
}).error(function () {
modelGetFailed();
}); });
$http.get("/rest/connections").success(function (data) { $http.get("/rest/connections").success(function (data) {
var now = Date.now(); var now = Date.now();
@ -21,8 +39,8 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http) {
for (var id in data) { for (var id in data) {
try { try {
data[id].inbps = 8 * (data[id].InBytesTotal - $scope.connections[id].InBytesTotal) / td; data[id].inbps = Math.max(0, 8 * (data[id].InBytesTotal - $scope.connections[id].InBytesTotal) / td);
data[id].outbps = 8 * (data[id].OutBytesTotal - $scope.connections[id].OutBytesTotal) / td; data[id].outbps = Math.max(0, 8 * (data[id].OutBytesTotal - $scope.connections[id].OutBytesTotal) / td);
} catch (e) { } catch (e) {
data[id].inbps = 0; data[id].inbps = 0;
data[id].outbps = 0; data[id].outbps = 0;

19
gui/index.html
View File

@ -118,6 +118,25 @@ html, body {
| <a href="https://github.com/calmh/syncthing">Source Code</a> | <a href="https://github.com/calmh/syncthing">Source Code</a>
</div> </div>
<div id="networkError" class="modal fade">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header alert alert-danger">
<h4 class="modal-title">
<span class="glyphicon glyphicon-exclamation-sign"></span>
Connection Error
</h4>
</div>
<div class="modal-body">
<p>
Syncthing seems to be down, or there is a problem with your Internet connection.
Retrying&hellip;
</p>
</div>
</div>
</div>
</div>
<script src="angular.min.js"></script> <script src="angular.min.js"></script>
<script src="jquery-2.0.3.min.js"></script> <script src="jquery-2.0.3.min.js"></script>
<script src="bootstrap/js/bootstrap.min.js"></script> <script src="bootstrap/js/bootstrap.min.js"></script>