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

Add QR modal at address list and clean deprecated code

Browse source
This commit is contained in:
Yemel Jardi 2014-07-18 11:23:45 -03:00
commit 0ffbd585f8
2 changed files with 34 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

25
js/controllers/addresses.js
View file

@ -1,7 +1,7 @@
'use strict';
angular.module('copayApp.controllers').controller('AddressesController',
function($scope, $rootScope, $timeout, controllerUtils) {
function($scope, $rootScope, $timeout, $modal, controllerUtils) {
$scope.loading = false;
var w = $rootScope.wallet;
@ -16,8 +16,21 @@ angular.module('copayApp.controllers').controller('AddressesController',
});
};
$scope.selectAddress = function(addr) {
$scope.selectedAddr = addr;
$scope.openAddressModal = function(address) {
var ModalInstanceCtrl = function ($scope, $modalInstance, address) {
$scope.address = address;
$scope.cancel = function () {
$modalInstance.dismiss('cancel');
};
};
$modal.open({
templateUrl: 'addressModal.html',
controller: ModalInstanceCtrl,
resolve: {
address: function() { return address; }
}
});
};
$rootScope.$watch('addrInfos', function() {
@ -37,9 +50,7 @@ angular.module('copayApp.controllers').controller('AddressesController',
'owned': addrinfo.owned
});
}
$scope.selectedAddr = $scope.addresses[0];
$scope.addrWithFund = $rootScope.receivedFund ? $rootScope.receivedFund[1] : null;
$rootScope.receivedFund = null;
}
}
});
}
);