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

Merge pull request #2652 from cmgustavo/bug/spinner-camera

Browse source 
Ack
This commit is contained in:
Matias Pando 2015-04-28 14:45:02 -03:00
commit ade3862a6b
2 changed files with 50 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/js/controllers/join.js
View file

@ -8,9 +8,12 @@ angular.module('copayApp.controllers').controller('joinController',
//TODO : make one function - this was copied from topbar.js //TODO : make one function - this was copied from topbar.js
var cordovaOpenScanner = function() { var cordovaOpenScanner = function() {
window.ignoreMobilePause = true; window.ignoreMobilePause = true;
window.plugins.spinnerDialog.show(null, 'Preparing camera...', true);
$timeout(function() {
cordova.plugins.barcodeScanner.scan( cordova.plugins.barcodeScanner.scan(
function onSuccess(result) { function onSuccess(result) {
$timeout(function() { $timeout(function() {
window.plugins.spinnerDialog.hide();
window.ignoreMobilePause = false; window.ignoreMobilePause = false;
}, 100); }, 100);
if (result.cancelled) return; if (result.cancelled) return;
@ -25,9 +28,12 @@ angular.module('copayApp.controllers').controller('joinController',
function onError(error) { function onError(error) {
$timeout(function() { $timeout(function() {
window.ignoreMobilePause = false; window.ignoreMobilePause = false;
window.plugins.spinnerDialog.hide();
}, 100); }, 100);
alert('Scanning error'); alert('Scanning error');
}); }
);
}, 100);
}; };
var modalOpenScanner = function() { var modalOpenScanner = function() {

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

@ -4,6 +4,7 @@ angular.module('copayApp.controllers').controller('topbarController', function($
var cordovaOpenScanner = function() { var cordovaOpenScanner = function() {
window.ignoreMobilePause = true; window.ignoreMobilePause = true;
window.plugins.spinnerDialog.show(null, 'Preparing camera...', true); window.plugins.spinnerDialog.show(null, 'Preparing camera...', true);
$timeout(function() {
cordova.plugins.barcodeScanner.scan( cordova.plugins.barcodeScanner.scan(
function onSuccess(result) { function onSuccess(result) {
$timeout(function() { $timeout(function() {
@ -26,6 +27,7 @@ angular.module('copayApp.controllers').controller('topbarController', function($
} }
); );
go.send(); go.send();
}, 100);
}; };
var modalOpenScanner = function() { var modalOpenScanner = function() {