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

fix some karma tests after rebase

Browse source
This commit is contained in:
Manuel Araoz 2014-09-09 11:23:21 -07:00
commit 048664b4af
1 changed files with 0 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
js/controllers/send.js
View file

@ -80,7 +80,6 @@ angular.module('copayApp.controllers').controller('SendController',
} }
$scope.showAddressBook = function() { $scope.showAddressBook = function() {
var w = w;
var flag; var flag;
if (w) { if (w) {
for (var k in w.addressBook) { for (var k in w.addressBook) {
@ -121,8 +120,6 @@ angular.module('copayApp.controllers').controller('SendController',
var amount = parseInt((form.amount.$modelValue * w.settings.unitToSatoshi).toFixed(0)); var amount = parseInt((form.amount.$modelValue * w.settings.unitToSatoshi).toFixed(0));
var commentText = form.comment.$modelValue; var commentText = form.comment.$modelValue;
var w = w;
function done(err, ntxid, merchantData) { function done(err, ntxid, merchantData) {
if (err) { if (err) {
var message = 'The transaction' + (w.isShared() ? ' proposal' : '') + ' could not be created'; var message = 'The transaction' + (w.isShared() ? ' proposal' : '') + ' could not be created';
@ -349,7 +346,6 @@ angular.module('copayApp.controllers').controller('SendController',
} }
$scope.toggleAddressBookEntry = function(key) { $scope.toggleAddressBookEntry = function(key) {
var w = w;
w.toggleAddressBookEntry(key); w.toggleAddressBookEntry(key);
}; };
@ -384,7 +380,6 @@ angular.module('copayApp.controllers').controller('SendController',
}); });
modalInstance.result.then(function(entry) { modalInstance.result.then(function(entry) {
var w = w;
$timeout(function() { $timeout(function() {
$scope.loading = false; $scope.loading = false;
@ -421,7 +416,6 @@ angular.module('copayApp.controllers').controller('SendController',
$scope.send = function(ntxid, cb) { $scope.send = function(ntxid, cb) {
$scope.loading = true; $scope.loading = true;
$rootScope.txAlertCount = 0; $rootScope.txAlertCount = 0;
var w = w;
w.sendTx(ntxid, function(txid, merchantData) { w.sendTx(ntxid, function(txid, merchantData) {
if (!txid) { if (!txid) {
notification.error('Error', 'There was an error sending the transaction'); notification.error('Error', 'There was an error sending the transaction');
@ -446,7 +440,6 @@ angular.module('copayApp.controllers').controller('SendController',
$scope.sign = function(ntxid) { $scope.sign = function(ntxid) {
$scope.loading = true; $scope.loading = true;
var w = w;
w.sign(ntxid, function(ret) { w.sign(ntxid, function(ret) {
if (!ret) { if (!ret) {
notification.error('Error', 'There was an error signing the transaction'); notification.error('Error', 'There was an error signing the transaction');
@ -466,7 +459,6 @@ angular.module('copayApp.controllers').controller('SendController',
$scope.reject = function(ntxid) { $scope.reject = function(ntxid) {
$scope.loading = true; $scope.loading = true;
$rootScope.txAlertCount = 0; $rootScope.txAlertCount = 0;
var w = w;
w.reject(ntxid); w.reject(ntxid);
notification.warning('Transaction rejected', 'You rejected the transaction successfully'); notification.warning('Transaction rejected', 'You rejected the transaction successfully');
$scope.loading = false; $scope.loading = false;