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

finished refactor

Browse source
This commit is contained in:
Manuel Araoz 2014-08-13 18:54:07 -04:00
commit 324dfbc36a
3 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
js/controllers/send.js
View file

@ -168,7 +168,6 @@ angular.module('copayApp.controllers').controller('SendController',
qrcode.imagedata = context.getImageData(0, 0, qrcode.width, qrcode.height); qrcode.imagedata = context.getImageData(0, 0, qrcode.width, qrcode.height);
try { try {
//alert(JSON.stringify(qrcode.process(context)));
qrcode.decode(); qrcode.decode();
} catch (e) { } catch (e) {
// error decoding QR // error decoding QR
@ -403,6 +402,19 @@ angular.module('copayApp.controllers').controller('SendController',
$scope.onChanged = function() { $scope.onChanged = function() {
var scope = $scope; var scope = $scope;
var value = scope.address;
var uri;
if (/^https?:\/\//.test(value)) {
uri = {
merchant: value
};
} else {
uri = copay.HDPath.parseBitcoinURI(value);
}
if (!uri || !uri.merchant) {
return;
}
notification.info('Fetching Payment', notification.info('Fetching Payment',
'Retrieving Payment Request from ' + uri.merchant); 'Retrieving Payment Request from ' + uri.merchant);

2
js/directives.js
View file

@ -29,7 +29,7 @@ angular.module('copayApp.directives')
ctrl.$setValidity('validAddress', true); ctrl.$setValidity('validAddress', true);
return 'Merchant: ' + uri.merchant; return uri.merchant;
}; };
ctrl.$parsers.unshift(validator); ctrl.$parsers.unshift(validator);

2
views/send.html
View file

@ -21,7 +21,7 @@
</label> </label>
<div class="small-10 columns"> <div class="small-10 columns">
<input type="text" id="address" name="address" ng-disabled="loading" <input type="text" id="address" name="address" ng-disabled="loading"
placeholder="Send to" ng-model="address" ngChange="onChanged()" valid-address required> placeholder="Send to" ng-model="address" ng-change="onChanged()" valid-address required>
<small class="icon-input" ng-show="!sendForm.address.$invalid && address"><i class="fi-check"></i></small> <small class="icon-input" ng-show="!sendForm.address.$invalid && address"><i class="fi-check"></i></small>
<small class="icon-input" ng-show="sendForm.address.$invalid && address"><i class="fi-x"></i></small> <small class="icon-input" ng-show="sendForm.address.$invalid && address"><i class="fi-x"></i></small>
</div> </div>