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

Keep current page after cancel the camera

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2015-12-08 12:14:44 -03:00
commit f8f7429411
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
public/views/walletHome.html
View file

@ -132,7 +132,7 @@
</div> </div>
</div> </div>
<div class="camera-icon" ng-show="index.isComplete"> <div class="camera-icon" ng-show="index.isComplete">
<qr-scanner on-scan="home.onQrCodeScanned(data)" before-scan="home.openSendScreen()"></qr-scanner> <qr-scanner on-scan="home.onQrCodeScanned(data)"></qr-scanner>
</div> </div>
</div> <!-- oh --> </div> <!-- oh -->
@ -381,7 +381,7 @@
</a> </a>
</h4> </h4>
<div class="camera-icon" ng-show="index.isComplete"> <div class="camera-icon" ng-show="index.isComplete">
<qr-scanner on-scan="home.onQrCodeScanned(data)" before-scan="home.openSendScreen()"></qr-scanner> <qr-scanner on-scan="home.onQrCodeScanned(data)"></qr-scanner>
</div> </div>
</div> </div>
<div class="box-notification m20t" ng-show="home.error" ng-click="home.resetError()"> <div class="box-notification m20t" ng-show="home.error" ng-click="home.resetError()">
@ -417,7 +417,7 @@
<a class="postfix size-12 m0 text-gray" <a class="postfix size-12 m0 text-gray"
ng-style="{'color':index.backgroundColor}" ng-style="{'color':index.backgroundColor}"
ng-click="home.openDestinationAddressModal(index.otherWallets, _address)"> ng-click="home.openDestinationAddressModal(index.otherWallets, _address)">
<i class="icon-wallet size-18"></i> <i class="icon-wallet text-bold size-18"></i>
</a> </a>
</div> </div>
</div> </div>

5
src/js/controllers/walletHome.js
View file

@ -97,13 +97,10 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
}; };
this.onQrCodeScanned = function(data) { this.onQrCodeScanned = function(data) {
if (data) go.send();
$rootScope.$emit('dataScanned', data); $rootScope.$emit('dataScanned', data);
}; };
this.openSendScreen = function() {
go.send();
};
rateService.whenAvailable(function() { rateService.whenAvailable(function() {
self.isRateAvailable = true; self.isRateAvailable = true;
$rootScope.$digest(); $rootScope.$digest();