Skip to content

Commit ffed19b

Browse files
author
Braydon Fuller
committed
Unsubscribe to address event, and update addresstxid data format
1 parent 0a06f9a commit ffed19b

File tree

1 file changed

+19
-11
lines changed

1 file changed

+19
-11
lines changed

public/src/js/controllers/address.js

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,34 @@ angular.module('insight.address').controller('AddressController',
44
function($scope, $rootScope, $routeParams, $location, Global, Address, getSocket) {
55
$scope.global = Global;
66

7-
87
var socket = getSocket($scope);
9-
10-
var _startSocket = function () {
11-
socket.on('bitcoind/addresstxid', function(tx) {
12-
$rootScope.$broadcast('tx', tx);
13-
var base = document.querySelector('base');
14-
var baseUrl = base && base.href || '';
15-
var beep = new Audio(baseUrl + '/sound/transaction.mp3');
16-
beep.play();
8+
var addrStr = $routeParams.addrStr;
9+
10+
var _startSocket = function() {
11+
socket.on('bitcoind/addresstxid', function(data) {
12+
if (data.address === addrStr) {
13+
$rootScope.$broadcast('tx', data.txid);
14+
var base = document.querySelector('base');
15+
var beep = new Audio(base.href + '/sound/transaction.mp3');
16+
beep.play();
17+
}
1718
});
18-
socket.emit('subscribe', 'bitcoind/addresstxid', [$routeParams.addrStr]);
19+
socket.emit('subscribe', 'bitcoind/addresstxid', [addrStr]);
20+
};
21+
22+
var _stopSocket = function () {
23+
socket.emit('unsubscribe', 'bitcoind/addresstxid', [addrStr]);
1924
};
2025

2126
socket.on('connect', function() {
2227
_startSocket();
2328
});
2429

25-
$scope.params = $routeParams;
30+
$scope.$on('$destroy', function(){
31+
_stopSocket();
32+
});
2633

34+
$scope.params = $routeParams;
2735

2836
$scope.findOne = function() {
2937
$rootScope.currentAddr = $routeParams.addrStr;

0 commit comments

Comments
 (0)