anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

update to socket.io 1.0, adds connection error warnings

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-06-04 18:10:47 -03:00
commit 3a4bb56c26
6 changed files with 75 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

30
js/controllers/header.js
View file

@ -33,14 +33,28 @@ angular.module('copayApp.controllers').controller('HeaderController',
}
});
// Initialize alert notification (not show when init wallet)
$rootScope.txAlertCount = 0;
$rootScope.$watch('txAlertCount', function(txAlertCount) {
if (txAlertCount && txAlertCount > 0) {
$notification.info('New Transaction', ($rootScope.txAlertCount == 1) ? 'You have a pending transaction proposal' : 'You have ' + $rootScope.txAlertCount + ' pending transaction proposals', txAlertCount);
}
$rootScope.$watch('blockChainStatus', function(status) {
var h = config.blockchain.host + ':' + config.blockchain.port;
if (status === 'error')
$rootScope.insightError = 1;
else
if (status === 'restored') {
$rootScope.insightError = 0;
$rootScope.$flashMessage = {
type: 'success',
message: 'Networking Restored',
};
}
});
// Init socket handlers (with no wallet yet)
controllerUtils.setSocketHandlers();
$rootScope.$watch('receivedFund', function(receivedFund) {
if (receivedFund) {
var currentAddr;
@ -59,6 +73,14 @@ angular.module('copayApp.controllers').controller('HeaderController',
}
});
$rootScope.$watch('txAlertCount', function(txAlertCount) {
if (txAlertCount && txAlertCount > 0) {
$notification.info('New Transaction', ($rootScope.txAlertCount == 1) ? 'You have a pending transaction proposal' : 'You have ' + $rootScope.txAlertCount + ' pending transaction proposals', txAlertCount);
}
});
$scope.isActive = function(item) {
if (item.link && item.link.replace('#','') == $location.path()) {
return true;