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

using only one variable in url

Browse source
This commit is contained in:
Gabriel Bazán 2015-12-09 12:16:15 -03:00
commit c5336221a4
2 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/js/init.js
View file

@ -11,8 +11,7 @@ angular.element(document).ready(function() {
if (!url) return;
if (url.indexOf('glidera') != -1) {
url = '#/uri-glidera' + url.replace('bitcoin://glidera', '');
}
else {
} else {
url = '#/uri-payment/' + url;
}
setTimeout(function() {
@ -48,9 +47,11 @@ angular.element(document).ready(function() {
// Back button event
document.addEventListener('backbutton', function() {
var loc = window.location;
var isHome = loc.toString().match(/index\.html#\/$/) ? 'true' : '';
var exit = loc.toString().match(/disclaimer/) ? 'true' : '';
if (exit != 'true')
var exit = loc.toString().match(/index\.html#\/$/) ? 'true' : '';
if (!window.ignoreMobilePause) {
window.location = '#/cordova/backbutton/'+isHome;
window.location = '#/cordova/backbutton/' + exit;
}
setTimeout(function() {
window.ignoreMobilePause = false;
@ -70,8 +71,12 @@ angular.element(document).ready(function() {
window.handleOpenURL = handleBitcoinURI;
window.plugins.touchid.isAvailable(
function(msg) { window.touchidAvailable = true; }, // success handler: TouchID available
function(msg) { window.touchidAvailable = false; } // error handler: no TouchID available
function(msg) {
window.touchidAvailable = true;
}, // success handler: TouchID available
function(msg) {
window.touchidAvailable = false;
} // error handler: no TouchID available
);
startAngular();

4
src/js/routes.js
View file

@ -475,7 +475,7 @@ angular
}
})
.state('cordova', {
url: '/cordova/:status/:isHome',
url: '/cordova/:status/:exit',
views: {
'main': {
controller: function($rootScope, $state, $stateParams, $timeout, go, isCordova) {
@ -484,7 +484,7 @@ angular
$rootScope.$emit('Local/Resume');
break;
case 'backbutton':
if (isCordova && $stateParams.isHome == 'true' && !$rootScope.modalOpened) {
if (isCordova && $stateParams.exit == 'true' && !$rootScope.modalOpened) {
navigator.app.exitApp();
} else {
$rootScope.$emit('closeModal');