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

Merge pull request #5408 from cmgustavo/bug/qr-scanner-01

Browse source 
Fix QR scanner from directive
This commit is contained in:
Javier Donadío 2017-01-06 17:20:06 -03:00 • committed by GitHub
commit e244290285
4 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/js/controllers/import.js
View file

@ -364,7 +364,7 @@ angular.module('copayApp.controllers').controller('importController',
}, 10);
};
$scope.$on("$ionicView.beforeEnter", function(event, data) {
$scope.$on("$ionicView.afterEnter", function(event, data) {
$scope.init();
});

7
src/js/directives/qrScanner.js
View file

@ -20,12 +20,17 @@ angular.module('copayApp.directives')
$state.go('scanner', { passthroughMode: 1 });
};
$rootScope.$on('$ionicView.afterEnter', function() {
var afterEnter = $rootScope.$on('$ionicView.afterEnter', function() {
if($rootScope.scanResult) {
scope.onScan({ data: $rootScope.scanResult });
$rootScope.scanResult = null;
}
});
// Destroy event
scope.$on('$destroy', function(){
afterEnter();
});
}
}
});

6
src/js/routes.js
View file

@ -336,7 +336,8 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
url: '/import',
views: {
'tab-home@tabs': {
templateUrl: 'views/import.html'
templateUrl: 'views/import.html',
controller: 'importController'
},
},
})
@ -787,7 +788,8 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
url: '/import',
views: {
'onboarding': {
templateUrl: 'views/import.html'
templateUrl: 'views/import.html',
controller: 'importController'
},
},
params: {