diff --git a/www/js/controllers/blockchain-controllers.js b/www/js/controllers/blockchain-controllers.js index e6c323e807b922b611859d07692f5fc6f7e07b4c..69e980234e633787b02abe034120326e9e9c9239 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 1603c556dca4aa193262a2f0df33e0e49541acb8..e85af6b4b23e43c4457b5c2f11b694ec18c0d708 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 1a075b78f51fc9145494378efa8d673264913330..0898ecef411a708a5c55216fdecf19bec6707b55 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 2747d338cf2944fd2cfc2b57beb7755014399954..d543d26641cd4adf26e7df2c470ba30f584420eb 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>