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

mocha test working again

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-04-15 12:17:28 -03:00
commit eff20ec49a
12 changed files with 243 additions and 304 deletions
Download patch file Download diff file Expand all files Collapse all files

2
js/controllers/send.js
View file

@ -1,7 +1,7 @@
'use strict';
angular.module('copay.send').controller('SendController',
function($scope, $rootScope, $location, Network, Storage) {
function($scope, $rootScope, $location, Network) {
$scope.title = 'Send';
if (!$rootScope.peerId) {

17
js/controllers/signin.js
View file

@ -1,15 +1,14 @@
'use strict';
angular.module('copay.signin').controller('SigninController',
function($scope, $rootScope, $location, Network, Storage) {
var peerData = Storage.get($rootScope.walletId, 'peerData');
function($scope, $rootScope, $location, Network) {
// var peerData = Storage.get($rootScope.walletId, 'peerData');
// $rootScope.peerId = peerData ? peerData.peerId : null;
$scope.loading = false;
$rootScope.peerId = peerData ? peerData.peerId : null;
$scope.listWalletIds = function() {
return Storage.getWalletIds();
return copay.Wallet.factory.getWalletIds();
};
$scope.create = function() {
@ -52,9 +51,9 @@ console.log('[signin.js.28:walletId:]',walletId); //TODO
}
};
if (peerData && peerData.peerId && peerData.connectedPeers.length > 0) {
$rootScope.peerId = peerData.peerId;
$scope.join(peerData.connectedPeers);
}
// if (peerData && peerData.peerId && peerData.connectedPeers.length > 0) {
// $rootScope.peerId = peerData.peerId;
// $scope.join(peerData.connectedPeers);
// }
});