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

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

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

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

@ -4,28 +4,30 @@ angular.module('copayApp.controllers').controller('topbarController', function($
var cordovaOpenScanner = function() {
window.ignoreMobilePause = true;
window.plugins.spinnerDialog.show(null, 'Preparing camera...', true);
cordova.plugins.barcodeScanner.scan(
function onSuccess(result) {
$timeout(function() {
window.plugins.spinnerDialog.hide();
window.ignoreMobilePause = false;
}, 100);
if (result.cancelled) return;
$timeout(function() {
cordova.plugins.barcodeScanner.scan(
function onSuccess(result) {
$timeout(function() {
window.plugins.spinnerDialog.hide();
window.ignoreMobilePause = false;
}, 100);
if (result.cancelled) return;
$timeout(function() {
var data = result.text;
$rootScope.$emit('dataScanned', data);
}, 1000);
},
function onError(error) {
$timeout(function() {
window.ignoreMobilePause = false;
window.plugins.spinnerDialog.hide();
}, 100);
alert('Scanning error');
}
);
go.send();
$timeout(function() {
var data = result.text;
$rootScope.$emit('dataScanned', data);
}, 1000);
},
function onError(error) {
$timeout(function() {
window.ignoreMobilePause = false;
window.plugins.spinnerDialog.hide();
}, 100);
alert('Scanning error');
}
);
go.send();
}, 100);
};
var modalOpenScanner = function() {