From 93056131c4056591cbce7cbf2dda1c7bd1b88b4f Mon Sep 17 00:00:00 2001
From: Benoit Lavenier <benoit.lavenier@e-is.pro>
Date: Thu, 6 Feb 2020 16:55:49 +0100
Subject: [PATCH] [fix] Hide loading indicator, when logout of a secondary
wallet
---
www/js/controllers/app-controllers.js | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/www/js/controllers/app-controllers.js b/www/js/controllers/app-controllers.js
index 90963f2b..806047b9 100644
--- a/www/js/controllers/app-controllers.js
+++ b/www/js/controllers/app-controllers.js
@@ -48,8 +48,6 @@ angular.module('cesium.app.controllers', ['cesium.platform', 'cesium.services'])
.controller('PluginExtensionPointCtrl', PluginExtensionPointController)
-
-
;
/**
@@ -127,14 +125,14 @@ function AppController($scope, $rootScope, $state, $ionicSideMenuDelegate, $q, $
// Login using keypair
return wallet.login({
- silent: true,
- forceAuth: true,
- minData: false,
- authData: {
- pubkey: pubkey,
- keypair: keypair
- }
- })
+ silent: true,
+ forceAuth: true,
+ minData: false,
+ authData: {
+ pubkey: pubkey,
+ keypair: keypair
+ }
+ })
.then(function () {
// Open transfer all wallet
@@ -344,7 +342,7 @@ function AppController($scope, $rootScope, $state, $ionicSideMenuDelegate, $q, $
});
}
else {
-
+ UIUtils.loading.hide();
}
})
.catch(UIUtils.onError());
@@ -427,6 +425,7 @@ function AppController($scope, $rootScope, $state, $ionicSideMenuDelegate, $q, $
$timeout(function(){$scope.profilePopover.hide();});
}
};
+
// Change peer info
$scope.showPeerInfoPopover = function(event) {
return UIUtils.popover.show(event, {
@@ -437,7 +436,7 @@ function AppController($scope, $rootScope, $state, $ionicSideMenuDelegate, $q, $
};
////////////////////////////////////////
- // Link management (fix issue #)
+ // Link management
////////////////////////////////////////
$scope.openLink = function($event, uri, options) {
@@ -486,7 +485,7 @@ function AppController($scope, $rootScope, $state, $ionicSideMenuDelegate, $q, $
okText: 'COMMON.BTN_YES'
})
.then(function(confirm) {
- if (!confirm) return;
+ if (!confirm) return;
$scope.toggleFullscreen();
});
};
--
GitLab