Merge pull request #2060 from matiu/bug/payment-intent

Bug/payment intent
This commit is contained in:
Gustavo Maximiliano Cortez 2014-12-09 19:32:18 -03:00
commit c2598b2646
39 changed files with 935 additions and 888 deletions

View file

@ -5,7 +5,7 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc
// Global go. This should be in a better place TODO
// We dont do a 'go' directive, to use the benefits of ng-touch with ng-click
$rootScope.go = function (path) {
go.go(path);
go.path(path);
};
var _credentials, _firstpin;
@ -25,8 +25,8 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc
$rootScope.fromEmailConfirmation = false;
}
if ($rootScope.iden) {
identityService.goWalletHome();
if ($rootScope.wallet) {
go.walletHome();
}
Compatibility.check($scope);
@ -178,7 +178,7 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc
}
}
});
}
};
function getParam(sname) {
var params = location.search.substr(location.search.indexOf("?") + 1);