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

Merge pull request #3027 from troggy/refactor/qr-scanner

Browse source 
Add QR scanner directive
This commit is contained in:
Gustavo Maximiliano Cortez 2015-08-31 10:27:18 -03:00
commit deba8f12af
3 changed files with 165 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

3
public/views/includes/topbar.html
View file

@ -15,8 +15,7 @@
</section>
<section class="right-small" ng-show="showCamera">
<a id="camera-icon" ng-show="index.isComplete" class="p10"
ng-click="topbar.openScanner()"><i class="icon-scan size-21"></i></a>
<qr-scanner ng-show="index.isComplete" on-scan="topbar.onQrCodeScanned(data)" before-scan="topbar.openSendScreen()" />
</section>
<section class="middle tab-bar-section">