From 95835d626fb3f1b4c89f5027d5e294ab90857546 Mon Sep 17 00:00:00 2001
From: blavenie <benoit.lavenier@e-is.pro>
Date: Thu, 26 Oct 2017 22:10:41 +0200
Subject: [PATCH] [fix] Block view: open raw block into a separated window
---
www/js/controllers/blockchain-controllers.js | 6 ++++++
www/js/controllers/network-controllers.js | 8 ++------
www/js/services/bma-services.js | 1 +
www/templates/blockchain/view_block.html | 3 +--
4 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/www/js/controllers/blockchain-controllers.js b/www/js/controllers/blockchain-controllers.js
index e6c323e80..69e980234 100644
--- a/www/js/controllers/blockchain-controllers.js
+++ b/www/js/controllers/blockchain-controllers.js
@@ -718,6 +718,12 @@ function BlockViewController($scope, $ionicPopover, $state, UIUtils, BMA, csCurr
$state.go(stateName, stateParams);
};
+ /* -- manage link to raw document -- */
+
+ $scope.openRawBlock = function(event) {
+ return $scope.openLink(event, $scope.node.url + '/blockchain/block/' + $scope.formData.number);
+ };
+
/* -- help tip -- */
// Show help tip
diff --git a/www/js/controllers/network-controllers.js b/www/js/controllers/network-controllers.js
index 1603c556d..e85af6b4b 100644
--- a/www/js/controllers/network-controllers.js
+++ b/www/js/controllers/network-controllers.js
@@ -586,14 +586,10 @@ function PeerViewController($scope, $q, $window, $state, UIUtils, csWot, BMA) {
/* -- manage link to raw document -- */
$scope.openRawPeering = function(event) {
- return $scope.openLink(event,
- ($scope.isHttps ? 'https://' : 'http://') + $scope.node.server + '/network/peering'
- );
+ return $scope.openLink(event, $scope.node.url + '/network/peering');
};
$scope.openRawCurrentBlock = function(event) {
- return $scope.openLink(event,
- ($scope.isHttps ? 'https://' : 'http://') + $scope.node.server + '/blockchain/current'
- );
+ return $scope.openLink(event, $scope.node.url + '/blockchain/current');
};
}
diff --git a/www/js/services/bma-services.js b/www/js/services/bma-services.js
index 1a075b78f..0898ecef4 100644
--- a/www/js/services/bma-services.js
+++ b/www/js/services/bma-services.js
@@ -834,6 +834,7 @@ angular.module('cesium.bma.services', ['ngApi', 'cesium.http.services', 'cesium.
host: host,
port: port,
useSsl: useSsl,
+ url: csHttp.getUrl(host, port, ''/*path*/, useSsl),
node: {
summary: csHttp.getWithCache(host, port, '/node/summary', useSsl, csHttp.cache.LONG, false, timeout)
},
diff --git a/www/templates/blockchain/view_block.html b/www/templates/blockchain/view_block.html
index 2747d338c..d543d2664 100644
--- a/www/templates/blockchain/view_block.html
+++ b/www/templates/blockchain/view_block.html
@@ -50,8 +50,7 @@
</h3>
<h3>
- <a target="_system"
- ng-href="{{node.url}}/blockchain/block/{{formData.number}}">
+ <a ng-click="openRawBlock($event)">
<i class="icon ion-share"></i> {{'BLOCKCHAIN.VIEW.SHOW_RAW'|translate}}
</a>
</h3>
--
GitLab