diff --git a/www/index.html b/www/index.html
index c0da044430766150c2217cbf5d4c472d655071ab..adc95d569abdadd81da107d51e27695617640cc4 100644
--- a/www/index.html
+++ b/www/index.html
@@ -131,8 +131,6 @@
<!-- config -->
<script src="js/config.js"></script>
<!-- endbuild -->
- <script type="text/javascript">
- </script>
</head>
<body ng-app="cesium" id="cesium" ng-strict-di ng-class="{'nobackdrop': $root.tour}">
<ion-nav-view></ion-nav-view>
diff --git a/www/js/controllers/currency-controllers.js b/www/js/controllers/currency-controllers.js
index ea8eb66d7f0678d484bc65534bc50995ba221c7a..7706ec7381adabb877803166e844f2644b7caf6e 100644
--- a/www/js/controllers/currency-controllers.js
+++ b/www/js/controllers/currency-controllers.js
@@ -37,29 +37,13 @@ angular.module('cesium.currency.controllers', ['cesium.services'])
controller: 'CurrencyViewCtrl'
}
}
- })
-
- .state('app.view_peer', {
- url: "/currency/peer/:server",
- nativeTransitions: {
- "type": "flip",
- "direction": "right"
- },
- views: {
- 'menuContent': {
- templateUrl: "templates/currency/view_peer.html",
- controller: 'PeerCtrl'
- }
- }
});
+
})
.controller('CurrencyLookupCtrl', CurrencyLookupController)
.controller('CurrencyViewCtrl', CurrencyViewController)
-
-.controller('PeerCtrl', PeerController)
-
;
function CurrencyLookupController($scope, $state, UIUtils, csCurrency) {
@@ -90,8 +74,6 @@ function CurrencyLookupController($scope, $state, UIUtils, csCurrency) {
}
function CurrencyViewController($scope, $q, $translate, $timeout, BMA, UIUtils, csSettings, csCurrency, csNetwork) {
-
- $scope.loadingPeers = true;
$scope.formData = {
useRelative: csSettings.data.useRelative
};
@@ -117,9 +99,9 @@ function CurrencyViewController($scope, $q, $translate, $timeout, BMA, UIUtils,
$scope.xpercent = 0;
$scope.$on('$ionicView.enter', function(e, state) {
- $translate(['COMMON.DATE_PATTERN'])
- .then(function($translations) {
- $scope.datePattern = $translations['COMMON.DATE_PATTERN'];
+ $translate('COMMON.DATE_PATTERN')
+ .then(function(datePattern) {
+ $scope.datePattern = datePattern;
if (state.stateParams && state.stateParams.name) { // Load by name
csCurrency.searchByName(state.stateParams.name)
.then(function(currency){
@@ -148,30 +130,6 @@ function CurrencyViewController($scope, $q, $translate, $timeout, BMA, UIUtils,
BMA.instance(currency.peer.host, currency.peer.port) : BMA;
UIUtils.loading.show();
- if ($scope.loadingPeers){
- csNetwork.start($scope.node);
-
- // Catch event on new peers
- var refreshing = false;
- csNetwork.api.data.on.changed($scope, function(data){
- if (!refreshing) {
- refreshing = true;
- $timeout(function() { // Timeout avoid to quick updates
- console.debug("Updating UI Peers");
- $scope.peers = data.peers;
- // Update currency params
-
- $scope.loadingPeers = csNetwork.isBusy();
- refreshing = false;
- $scope.loadParameter();
- }, 1100);
- }
- });
- $scope.$on('$destroy', function(){
- csNetwork.close();
- });
- }
-
// Load currency parameters
$scope.loadParameter();
@@ -266,17 +224,6 @@ function CurrencyViewController($scope, $q, $translate, $timeout, BMA, UIUtils,
});
};
- $scope.refresh = function() {
- UIUtils.loading.show();
-
- $scope.loadParameter()
- .then(function(){
- // Network
- $scope.loadingPeers = true;
- csNetwork.loadPeers();
- });
- };
-
$scope.onUseRelativeChanged = function() {
if ($scope.loading) return;
if ($scope.formData.useRelative) {
diff --git a/www/js/controllers/network-controllers.js b/www/js/controllers/network-controllers.js
index 190b8cea97d6cbc5dcba91d0c09105b3e608fc52..a2649840eab92ba731a9c00e953f4a79ad68b89e 100644
--- a/www/js/controllers/network-controllers.js
+++ b/www/js/controllers/network-controllers.js
@@ -14,6 +14,20 @@ angular.module('cesium.network.controllers', ['cesium.services'])
controller: 'NetworkViewCtrl'
}
},
+ })
+
+ .state('app.view_peer', {
+ url: "/network/peer/:server",
+ nativeTransitions: {
+ "type": "flip",
+ "direction": "right"
+ },
+ views: {
+ 'menuContent': {
+ templateUrl: "templates/network/view_peer.html",
+ controller: 'PeerCtrl'
+ }
+ }
});
})
@@ -24,38 +38,25 @@ angular.module('cesium.network.controllers', ['cesium.services'])
;
function NetworkViewController($scope, $q, $translate, $timeout, BMA, UIUtils, csSettings, csCurrency, csNetwork) {
-
- $scope.loadingPeers = true;
+ $scope.loadingPeers = true;
$scope.formData = {
useRelative: csSettings.data.useRelative
};
$scope.screen = UIUtils.screen;
- $scope.$on('$ionicView.enter', function(e, state) {
- $translate(['COMMON.DATE_PATTERN'])
- .then(function($translations) {
- $scope.datePattern = $translations['COMMON.DATE_PATTERN'];
- if (state.stateParams && state.stateParams.name) { // Load by name
- csCurrency.searchByName(state.stateParams.name)
- .then(function(currency){
- $scope.load(currency);
- });
+ $scope.$on('$ionicParentView.enter', function(e, state) {
+ csCurrency.all()
+ .then(function (currencies) {
+ if (currencies && currencies.length > 0) {
+ $scope.load(currencies[0]);
}
- else {
- csCurrency.all()
- .then(function (currencies) {
- if (currencies && currencies.length > 0) {
- $scope.load(currencies[0]);
- }
-
- })
- .catch(UIUtils.onError('ERROR.GET_CURRENCY_FAILED'));
- }
- });
+
+ })
+ .catch(UIUtils.onError('ERROR.GET_CURRENCY_FAILED'));
});
- $scope.$on('$ionicView.beforeLeave', function(){
+ $scope.$on('$ionicParentView.beforeLeave', function(){
csNetwork.close();
});
diff --git a/www/templates/currency/tabs/view_network.html b/www/templates/currency/tabs/view_network.html
index 8f8a80c9389092fb90029af0807fc224043cd45e..bf92feabb4d4e62b1a0068eb20f5e48bed69d423 100644
--- a/www/templates/currency/tabs/view_network.html
+++ b/www/templates/currency/tabs/view_network.html
@@ -18,36 +18,7 @@
<span class="badge badge-stable">{{difficulty | formatInteger}}</span>
</ion-item>
- <div id="helptip-currency-peers"
- class="item item-divider item-icon-right">
- {{'PEER.PEERS'|translate}}
- <ion-spinner class="icon" icon="android" ng-if="loadingPeers"></ion-spinner>
- <a class="icon ion-loop gray hidden-xs hidden-sm" ng-if="!loadingPeers" ng-click="refresh()">
- </a>
- </div>
+ <ng-include ng-controller="NetworkViewCtrl" src="'templates/network/tabs/view_nodes.html'" ></ng-include>
- <a class="peer-item item item-icon-left"
- ng-repeat="peer in peers track by peer.server"
- id="helptip-currency-peer-{{$index}}"
- ng-class="{ assertive: !peer.online, balanced: (peer.online && peer.hasMainConsensusBlock), energized: (peer.online && !peer.hasMainConsensusBlock)}"
- ui-sref="app.view_peer({server: peer.server})">
- <i class="icon ion-android-globe"></i>
- <div class="row no-padding">
- <div class="col no-padding">
- <h3><i ng-class="{'ion-person': peer.uid, 'ion-key': !peer.uid}"></i> {{peer.uid || peer.pubkey.substr(0,8)}}</span> <span class="gray">{{peer.dns && ' | ' + peer.dns}}</h3>
- <h4>{{peer.server}}</h4>
- </div>
- <div class="col col-10 no-padding" ng-if="settings.expertMode">
- <h3 class="hidden-sm hidden-xs hidden-md">
- <span ng-if="peer.level"><i class="ion-lock-combination"></i> {{peer.level}}</span>
- <span ng-if="!peer.level" translate>PEER.MIRROR</span>
- </h3>
- <h4 class="hidden-sm hidden-xs hidden-md gray">v{{peer.version}}</h4>
- </div>
- <div class="col col-20 no-padding">
- <span id="helptip-currency-peer-{{$index}}-block"
- class="badge" ng-class="{ 'badge-balanced': peer.hasMainConsensusBlock, 'badge-energized': peer.hasConsensusBlock }">{{peer.currentNumber}}</span>
- </div>
- </div>
- </a>
+
</div>
diff --git a/www/templates/network/view_network.html b/www/templates/network/view_network.html
index 6b3b79c2437544a327f333fa2909599722f3c27f..a2251c74b8f36fcc0aaf64be45565a552cf4270c 100644
--- a/www/templates/network/view_network.html
+++ b/www/templates/network/view_network.html
@@ -13,7 +13,7 @@
<ion-content>
<div class="row">
<div class="row responsive-sm">
- <div class="col col-90">
+ <div class="col col-100">
<ng-include src="'templates/network/tabs/view_nodes.html'"></ng-include>
</div>
</div>