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

Merge pull request #4245 from matiu/bug/go.is

Browse source 
fix go.is
This commit is contained in:
Matias Alejo Garcia 2016-05-24 15:59:26 -03:00
commit 1c09f60066
2 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/js/controllers/index.js
View file

@ -211,7 +211,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
}, 300); }, 300);
} }
if (!self.tab || go.is('walletHome')) if (!self.tab || !go.is('walletHome'))
self.tab = 'walletHome'; self.tab = 'walletHome';
var changeTab = function() { var changeTab = function() {
@ -235,7 +235,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
$rootScope.$emit('Local/TabChanged', tab); $rootScope.$emit('Local/TabChanged', tab);
}; };
if (switchState && go.is('walletHome')) { if (switchState && !go.is('walletHome')) {
go.path('walletHome', function() { go.path('walletHome', function() {
changeTab(); changeTab();
}); });

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

@ -125,8 +125,6 @@ angular.module('copayApp.controllers').controller('joinController',
this._join = function(opts) { this._join = function(opts) {
self.loading = true; self.loading = true;
$timeout(function() { $timeout(function() {
console.log('[join.js.124]', opts); //TODO
profileService.joinWallet(opts, function(err) { profileService.joinWallet(opts, function(err) {
if (err) { if (err) {
self.loading = false; self.loading = false;