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

not available for mobile

Browse source
This commit is contained in:
Javier 2016-09-12 17:59:36 -03:00
commit 11865c25ef
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/js/controllers/modals/scanner.js
View file

@ -1,6 +1,6 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('scannerController', function($scope, $timeout, storageService, $ionicModal) { angular.module('copayApp.controllers').controller('scannerController', function($scope, $timeout, storageService, $ionicModal, platformInfo) {
// QR code Scanner // QR code Scanner
var video; var video;
@ -73,6 +73,12 @@ angular.module('copayApp.controllers').controller('scannerController', function(
}; };
$scope.init = function() { $scope.init = function() {
if (platformInfo.isCordova) scannerInit();
else checkTips();
};
function checkTips() {
//TODO addapt tips to the new QR plugin (mobile)
storageService.getScanTipsAccepted(function(err, accepted) { storageService.getScanTipsAccepted(function(err, accepted) {
if (err) $log.warn(err); if (err) $log.warn(err);
if (accepted) { if (accepted) {

4
src/js/controllers/tab-receive.js
View file

@ -8,9 +8,9 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
$scope.wallets = profileService.getWallets({ $scope.wallets = profileService.getWallets({
onlyComplete: true onlyComplete: true
}); });
$scope.isCordova = platformInfo.isCordova;
$scope.isNW = platformInfo.isNW; $scope.isNW = platformInfo.isNW;
$scope.checkTips(); $scope.isCordova = platformInfo.isCordova;
if (!$scope.isCordova) $scope.checkTips();
} }
$scope.checkTips = function() { $scope.checkTips = function() {