From 5f3802b875ee117c98646dedc2d270b8dc6e7505 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Tue, 24 May 2016 15:58:59 -0300 Subject: [PATCH] fix go.is --- src/js/controllers/index.js | 4 ++-- src/js/controllers/join.js | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 2add9d78a..fbde07792 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -211,7 +211,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r }, 300); } - if (!self.tab || go.is('walletHome')) + if (!self.tab || !go.is('walletHome')) self.tab = 'walletHome'; var changeTab = function() { @@ -235,7 +235,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r $rootScope.$emit('Local/TabChanged', tab); }; - if (switchState && go.is('walletHome')) { + if (switchState && !go.is('walletHome')) { go.path('walletHome', function() { changeTab(); }); diff --git a/src/js/controllers/join.js b/src/js/controllers/join.js index feec6812e..5a6ceabbb 100644 --- a/src/js/controllers/join.js +++ b/src/js/controllers/join.js @@ -125,8 +125,6 @@ angular.module('copayApp.controllers').controller('joinController', this._join = function(opts) { self.loading = true; $timeout(function() { - -console.log('[join.js.124]', opts); //TODO profileService.joinWallet(opts, function(err) { if (err) { self.loading = false;