mirror of https://github.com/BTCPrivate/copay.git
Merge branch 'master' into feature/01-alert-txs
This commit is contained in:
commit
3f8612ee0c
|
@ -110,7 +110,7 @@ body {
|
|||
background: #fff;
|
||||
}
|
||||
|
||||
.addresses .panel:hover {
|
||||
.addresses .panel:hover, .addresses .panel.selected {
|
||||
background: #efefef;
|
||||
}
|
||||
|
||||
|
|
|
@ -314,13 +314,12 @@
|
|||
|
||||
<!-- ADDRESS -->
|
||||
<script type="text/ng-template" id="addresses.html">
|
||||
<div class="addresses" data-ng-controller="AddressesController">
|
||||
<div class="addresses" ng-controller="AddressesController">
|
||||
<div ng-show='$root.wallet.publicKeyRing.isComplete()'>
|
||||
<div class="row">
|
||||
<div class="large-9 medium-12 columns" ng-if="addrInfos[0]">
|
||||
<div class="large-8 medium-8 columns">
|
||||
<a class="panel radius db" ng-repeat="addrInfo in addrInfos"
|
||||
ng-click="selectAddr(addrInfo.address.toString())">
|
||||
<a class="panel radius db" ng-repeat="addrInfo in addrInfos" ng-click="$root.selectedAddr = addrInfo.address.toString()" ng-class="selectAddr('{{addrInfo.address.toString()}}')">
|
||||
<span>{{addrInfo.address.toString()}}</span>
|
||||
<span ng-if="addrInfo.isChange">(change)</span>
|
||||
<span class="right">
|
||||
|
|
|
@ -1,15 +1,17 @@
|
|||
'use strict';
|
||||
|
||||
angular.module('copay.addresses').controller('AddressesController',
|
||||
function($scope, $rootScope, controllerUtils) {
|
||||
function($scope, $rootScope, $timeout, controllerUtils) {
|
||||
$scope.loading = false;
|
||||
var w = $rootScope.wallet;
|
||||
|
||||
$scope.newAddr = function() {
|
||||
$scope.loading = true;
|
||||
w.generateAddress(null, function() {
|
||||
setTimeout(function() {
|
||||
$timeout(function() {
|
||||
controllerUtils.setSocketHandlers();
|
||||
controllerUtils.updateAddressList();
|
||||
$rootScope.selectedAddr = $rootScope.addrInfos[0].address.toString();
|
||||
$scope.loading = false;
|
||||
$rootScope.$digest();
|
||||
},1);
|
||||
|
@ -17,7 +19,6 @@ angular.module('copay.addresses').controller('AddressesController',
|
|||
};
|
||||
|
||||
$scope.selectAddr = function (addr) {
|
||||
$scope.selectedAddr = addr;
|
||||
return addr === $rootScope.selectedAddr ? 'selected' : '';
|
||||
};
|
||||
|
||||
});
|
||||
|
|
|
@ -67,6 +67,8 @@ angular.module('copay.signin').controller('SigninController',
|
|||
if (err || !w) {
|
||||
if (err === 'joinError')
|
||||
$rootScope.flashMessage = { message: 'Can not find peer'};
|
||||
else if (err === 'walletFull')
|
||||
$rootScope.flashMessage = { message: 'The wallet is full'};
|
||||
else if (err === 'badSecret')
|
||||
$rootScope.flashMessage = { message: 'Bad secret secret string', type: 'error'};
|
||||
else
|
||||
|
|
|
@ -200,8 +200,14 @@ WalletFactory.prototype.joinCreateSession = function(secret, nickname, passphras
|
|||
self.network.cleanUp();
|
||||
self.network.start(opts, function() {
|
||||
self.network.connectTo(s.pubKey);
|
||||
|
||||
// This is a hack to reconize if the connection was rejected or the peer wasn't there.
|
||||
var connectedOnce = false;
|
||||
self.network.on('connected', function(sender, data) {
|
||||
connectedOnce = true;
|
||||
});
|
||||
self.network.on('onlyYou', function(sender, data) {
|
||||
return cb('joinError');
|
||||
return cb(connectedOnce ? 'walletFull' : 'joinError');
|
||||
});
|
||||
self.network.on('data', function(sender, data) {
|
||||
if (data.type ==='walletId') {
|
||||
|
|
|
@ -223,6 +223,7 @@ Network.prototype._setupConnectionHandlers = function(dataConn, toCopayerId) {
|
|||
|
||||
// The connecting peer send hello
|
||||
if(toCopayerId) {
|
||||
self.emit('connected');
|
||||
self._sendHello(toCopayerId);
|
||||
self._addConnectedCopayer(toCopayerId);
|
||||
}
|
||||
|
|
|
@ -19,7 +19,7 @@ angular.module('copay.controllerUtils')
|
|||
video.close();
|
||||
// Clear rootScope
|
||||
for (var i in $rootScope) {
|
||||
if (i.charAt(0) != '$') {
|
||||
if (i.charAt(0) != '$' && i != 'flashMessage') {
|
||||
delete $rootScope[i];
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue