Merge pull request #2651 from cmgustavo/feat/camera-01
Adds spinner while loading camera on devices
This commit is contained in:
commit
e9afb8cf7f
1 changed files with 6 additions and 2 deletions
|
|
@ -3,9 +3,11 @@
|
||||||
angular.module('copayApp.controllers').controller('topbarController', function($rootScope, $scope, $timeout, $modal, isCordova, isMobile, go) {
|
angular.module('copayApp.controllers').controller('topbarController', function($rootScope, $scope, $timeout, $modal, isCordova, isMobile, go) {
|
||||||
var cordovaOpenScanner = function() {
|
var cordovaOpenScanner = function() {
|
||||||
window.ignoreMobilePause = true;
|
window.ignoreMobilePause = true;
|
||||||
|
window.plugins.spinnerDialog.show(null, 'Preparing camera...', true);
|
||||||
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;
|
||||||
|
|
@ -18,9 +20,11 @@ angular.module('copayApp.controllers').controller('topbarController', function($
|
||||||
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');
|
||||||
});
|
}
|
||||||
|
);
|
||||||
go.send();
|
go.send();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue