From 11865c25efec66a076f8bf995fee5eba5dd7c88e Mon Sep 17 00:00:00 2001 From: Javier Date: Mon, 12 Sep 2016 17:59:36 -0300 Subject: [PATCH] not available for mobile --- src/js/controllers/modals/scanner.js | 8 +++++++- src/js/controllers/tab-receive.js | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/js/controllers/modals/scanner.js b/src/js/controllers/modals/scanner.js index f92b2d14f..6616d505a 100644 --- a/src/js/controllers/modals/scanner.js +++ b/src/js/controllers/modals/scanner.js @@ -1,6 +1,6 @@ '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 var video; @@ -73,6 +73,12 @@ angular.module('copayApp.controllers').controller('scannerController', 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) { if (err) $log.warn(err); if (accepted) { diff --git a/src/js/controllers/tab-receive.js b/src/js/controllers/tab-receive.js index 2fa2147f6..187d3822e 100644 --- a/src/js/controllers/tab-receive.js +++ b/src/js/controllers/tab-receive.js @@ -8,9 +8,9 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi $scope.wallets = profileService.getWallets({ onlyComplete: true }); - $scope.isCordova = platformInfo.isCordova; $scope.isNW = platformInfo.isNW; - $scope.checkTips(); + $scope.isCordova = platformInfo.isCordova; + if (!$scope.isCordova) $scope.checkTips(); } $scope.checkTips = function() {