Merge pull request #194 from gabrielbazan7/feat/addQrSendTab

add qr scanner to send tab
This commit is contained in:
Gustavo Maximiliano Cortez 2016-09-27 09:58:30 -03:00 committed by GitHub
commit 9a9cad30bf
2 changed files with 20 additions and 7 deletions

View File

@ -8,11 +8,14 @@
<div class="item item-heading" translate>Recipient</div>
<label class="item item-input bitcoin-address">
<i class="icon ion-search placeholder-icon"></i>
<input type="text"
placeholder="Search or enter bitcoin address"
ng-model="formData.search"
ng-change="findContact(formData.search)"
ng-model-onblur>
<div class="qr-scan-icon" ng-style="{'width': '100%'}">
<qr-scanner class="qr-icon size-24" ng-style="{'top': '3px'}" on-scan="onQrCodeScanned(data)"></qr-scanner>
<input type="text"
placeholder="Search or enter bitcoin address"
ng-model="formData.search"
ng-change="findContact(formData.search)"
ng-model-onblur>
</div>
</label>
</div>

View File

@ -86,8 +86,18 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
});
};
$scope.$on("$ionicView.beforeEnter", function(event, data){
$scope.formData = { search: null };
$scope.onQrCodeScanned = function(data) {
if (!incomingData.redir(data)) {
$ionicPopup.alert({
title: 'Invalid data',
});
}
};
$scope.$on("$ionicView.beforeEnter", function(event, data) {
$scope.formData = {
search: null
};
updateList();
});