From 6d222d2fca1d452d00ac1eea6495fe89ff769b3d Mon Sep 17 00:00:00 2001 From: Mario Colque Date: Thu, 13 Feb 2014 10:57:37 -0300 Subject: [PATCH 1/2] Hide error message when a tx, addr or block is not found --- public/src/js/controllers/address.js | 1 + public/src/js/controllers/blocks.js | 1 + public/src/js/controllers/index.js | 5 +---- public/src/js/controllers/transactions.js | 1 + public/views/index.html | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/public/src/js/controllers/address.js b/public/src/js/controllers/address.js index 89780ee..415cf63 100644 --- a/public/src/js/controllers/address.js +++ b/public/src/js/controllers/address.js @@ -12,6 +12,7 @@ function($scope, $rootScope, $routeParams, $location, Global, Address, getSocket }, function(address) { $rootScope.titleDetail = address.addrStr.substring(0,7) + '...'; + $rootScope.flashMessage = null; $scope.address = address; }, function(e) { diff --git a/public/src/js/controllers/blocks.js b/public/src/js/controllers/blocks.js index b212c4e..b96d576 100644 --- a/public/src/js/controllers/blocks.js +++ b/public/src/js/controllers/blocks.js @@ -68,6 +68,7 @@ angular.module('insight.blocks').controller('BlocksController', blockHash: $routeParams.blockHash }, function(block) { $rootScope.titleDetail = block.height; + $rootScope.flashMessage = null; $scope.loading = false; $scope.block = block; }, function(e) { diff --git a/public/src/js/controllers/index.js b/public/src/js/controllers/index.js index 398b246..0df5ba5 100644 --- a/public/src/js/controllers/index.js +++ b/public/src/js/controllers/index.js @@ -4,7 +4,7 @@ var TRANSACTION_DISPLAYED = 10; var BLOCKS_DISPLAYED = 5; angular.module('insight.system').controller('IndexController', - function($scope, $rootScope, Global, getSocket, Blocks) { + function($scope, Global, getSocket, Blocks) { $scope.global = Global; var _getBlocks = function() { @@ -19,9 +19,6 @@ angular.module('insight.system').controller('IndexController', var socket = getSocket($scope); socket.emit('subscribe', 'inv'); - //show errors - $scope.flashMessage = $rootScope.flashMessage || null; - socket.on('tx', function(tx) { $scope.txs.unshift(tx); if (parseInt($scope.txs.length, 10) >= parseInt(TRANSACTION_DISPLAYED, 10)) { diff --git a/public/src/js/controllers/transactions.js b/public/src/js/controllers/transactions.js index 36f8e91..7e34a7b 100644 --- a/public/src/js/controllers/transactions.js +++ b/public/src/js/controllers/transactions.js @@ -112,6 +112,7 @@ function($scope, $rootScope, $routeParams, $location, Global, Transaction, Trans txId: txid }, function(tx) { $rootScope.titleDetail = tx.txid.substring(0,7) + '...'; + $rootScope.flashMessage = null; $scope.tx = tx; _processTX(tx); $scope.txs.unshift(tx); diff --git a/public/views/index.html b/public/views/index.html index 2db48e0..20e881a 100644 --- a/public/views/index.html +++ b/public/views/index.html @@ -1,5 +1,5 @@
- {{flashMessage}} + {{$root.flashMessage}}
From 056498e773383b20eb12d74ad58886725e008f4c Mon Sep 17 00:00:00 2001 From: Mario Colque Date: Thu, 13 Feb 2014 10:59:15 -0300 Subject: [PATCH 2/2] change url link --- public/views/block.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/views/block.html b/public/views/block.html index 8a67400..6eaa1e6 100644 --- a/public/views/block.html +++ b/public/views/block.html @@ -9,7 +9,7 @@

Hashes