From 729c9798c6c752b64d59f1609f15d53fc4142dd9 Mon Sep 17 00:00:00 2001
From: blavenie <benoit.lavenier@e-is.pro>
Date: Tue, 7 Feb 2017 18:25:22 +0100
Subject: [PATCH] - network: remove blockchain time (on peers table header),
and fix URL when removing filter
---
www/js/controllers/network-controllers.js | 7 +++++--
www/templates/network/view_network.html | 14 +-------------
2 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/www/js/controllers/network-controllers.js b/www/js/controllers/network-controllers.js
index 170aae747..874e5fa4f 100644
--- a/www/js/controllers/network-controllers.js
+++ b/www/js/controllers/network-controllers.js
@@ -66,7 +66,10 @@ function NetworkLookupController($scope, $timeout, $state, $ionicHistory, $ionic
$scope.node = !BMA.node.same(currency.peer.host, currency.peer.port) ?
BMA.instance(currency.peer.host, currency.peer.port) : BMA;
if (state && state.stateParams) {
- if (state.stateParams.type) {
+ if (state.stateParams.type && (
+ state.stateParams.type === 'mirror' ||
+ state.stateParams.type === 'member' ||
+ state.stateParams.type === 'offline')) {
$scope.search.type = state.stateParams.type;
}
if (state.stateParams.expert) {
@@ -163,7 +166,7 @@ function NetworkLookupController($scope, $timeout, $state, $ionicHistory, $ionic
$scope.toggleSearchType = function(type){
$scope.hideActionsPopover();
if ($scope.search.type === type || type === 'none') {
- $scope.search.type = false;
+ $scope.search.type = undefined;
}
else {
$scope.search.type = type;
diff --git a/www/templates/network/view_network.html b/www/templates/network/view_network.html
index 1e0ed8b95..d54604150 100644
--- a/www/templates/network/view_network.html
+++ b/www/templates/network/view_network.html
@@ -21,24 +21,12 @@
<span ng-if="enableFilter && search.type=='offline'" translate>PEER.OFFLINE</span>
<span ng-if="!enableFilter || !search.type" translate>PEER.ALL_PEERS</span>
<span ng-if="!search.loading">({{search.results.length}})</span>
-
+ <ion-spinner ng-if="search.loading" class="icon ion-spinner-small" icon="android"></ion-spinner>
</h4>
- <h5 class="dark" ng-if="!search.loading">
- <i class="icon ion-clock"></i>
- {{mainBlock.medianTime | formatDate}}
- <span class="gray">
- ({{'NETWORK.VIEW.MEDIAN_TIME'|translate}})
- </span>
- </h5>
- <h5 class="gray" ng-if="search.loading" >
- <ion-spinner class="icon ion-spinner-small" icon="android"></ion-spinner>
- <span translate>NETWORK.VIEW.LOADING_PEERS</span>
- </h5>
</div>
<div class="pull-right">
-
<div class="pull-right" ng-if="enableFilter">
<a class="button button-text button-small hidden-xs hidden-sm ink"
ng-class="{'button-text-positive': search.type=='member'}"
--
GitLab