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

Merge pull request #2535 from matiaspando/bug/barcodeAndroid

Browse source 
Fixing barcode scanner (Android) with new cordova plugin
This commit is contained in:
Gustavo Maximiliano Cortez 2015-04-17 12:39:22 -03:00
commit 6b8a561f6a
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/js/init.js
View file

@ -4,7 +4,7 @@ angular.element(document).ready(function() {
// Run copayApp after device is ready. // Run copayApp after device is ready.
var startAngular = function() { var startAngular = function() {
angular.bootstrap(document, ['copayApp']); angular.bootstrap(document, ['copayApp']);
}; };
/* Cordova specific Init */ /* Cordova specific Init */
if (window.cordova !== undefined) { if (window.cordova !== undefined) {
@ -25,7 +25,9 @@ angular.element(document).ready(function() {
}, false); }, false);
document.addEventListener('resume', function() { document.addEventListener('resume', function() {
window.location = '#/cordova/resume'; if (!window.ignoreMobilePause) {
window.location = '#/cordova/resume';
}
setTimeout(function() { setTimeout(function() {
window.ignoreMobilePause = false; window.ignoreMobilePause = false;
}, 100); }, 100);
@ -34,7 +36,7 @@ angular.element(document).ready(function() {
// We are not emitting here, since when the BWS socket reconnects, // We are not emitting here, since when the BWS socket reconnects,
// update will be triggered // update will be triggered
document.addEventListener('offline', function() { document.addEventListener('offline', function() {
window.location = '#/cordova/offline'; window.location = '#/cordova/offline';
}, false); }, false);
// //
// document.addEventListener("online", function() { // document.addEventListener("online", function() {