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

Uses the common qr-scanner directive for joining

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2015-09-28 01:20:16 -03:00
commit e9558cafaf
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
3 changed files with 12 additions and 142 deletions
Download patch file Download diff file Expand all files Collapse all files

13
public/views/join.html
View file

@ -63,18 +63,9 @@
<div class="input">
<input id="secret" type="text" placeholder="{{'Paste invitation here'|translate}}" name="secret" ng-model="secret" wallet-secret required>
<div ng-hide="showScanner || disableScanner">
<a class="postfix text-right" ng-click="join.openScanner()"><i class="icon-scan size-18">&nbsp;</i></a>
<div class="qr-scanner-input">
<qr-scanner on-scan="join.onQrCodeScanned(data)"></qr-scanner>
</div>
<div ng-show="showScanner">
<a class="postfix button warning" ng-click="cancelScanner()"><i class="fi-x">&nbsp;</i></a>
</div>
</div>
<div id="scanner"
class="row"
ng-if="showScanner"
ng-include="'views/includes/scanner.html'">
</div>
<a class="button outline light-gray tiny expand" ng-click="join.hideAdv=!join.hideAdv">