mirror of https://github.com/BTCPrivate/copay.git
signout/lock text
This commit is contained in:
parent
583b8314ec
commit
74d6f76d8e
|
@ -34,7 +34,6 @@
|
|||
<div class="contener_mixte"><div class="ballcolor ball_3"> </div></div>
|
||||
<div class="contener_mixte"><div class="ballcolor ball_4"> </div></div>
|
||||
</div>
|
||||
<span class="text-gray size-12" translate>Logging Out</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
'use strict';
|
||||
|
||||
angular.module('copayApp.controllers').controller('SidebarController', function($scope, $rootScope, $location, $timeout, identityService) {
|
||||
angular.module('copayApp.controllers').controller('SidebarController', function($scope, $rootScope, $location, $timeout, identityService, pinService) {
|
||||
|
||||
$scope.menu = [{
|
||||
'title': 'Home',
|
||||
|
@ -48,7 +48,7 @@ angular.module('copayApp.controllers').controller('SidebarController', function(
|
|||
|
||||
$scope.init = function() {
|
||||
// This should be called only once.
|
||||
|
||||
|
||||
// focused wallet change
|
||||
if ($rootScope.wallet) {
|
||||
$rootScope.$watch('wallet', function() {
|
||||
|
@ -73,16 +73,17 @@ angular.module('copayApp.controllers').controller('SidebarController', function(
|
|||
if (newWid && $rootScope.iden.getWalletById(newWid)) {
|
||||
identityService.setFocusedWallet(newWid);
|
||||
} else {
|
||||
copay.logger.debug('No wallets');
|
||||
copay.logger.debug('No wallets');
|
||||
identityService.noFocusedWallet(newWid);
|
||||
}
|
||||
}
|
||||
$scope.walletSelection = false;
|
||||
$scope.setWallets();
|
||||
});
|
||||
|
||||
pinService.check(function(err, value) {
|
||||
$scope.hasPin = value;
|
||||
});
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
$scope.setWallets = function() {
|
||||
|
|
|
@ -355,17 +355,17 @@ Identity.prototype.remove = function(opts, cb) {
|
|||
};
|
||||
|
||||
Identity.prototype._cleanUp = function() {
|
||||
// NOP
|
||||
_.each(this.wallets, function(w){
|
||||
w.close();
|
||||
});
|
||||
};
|
||||
|
||||
/**
|
||||
* @desc Closes the wallet and disconnects all services
|
||||
*/
|
||||
Identity.prototype.close = function() {
|
||||
var self = this;
|
||||
self.store({}, function(err) {
|
||||
self.emitAndKeepAlive('closed');
|
||||
});
|
||||
this._cleanUp();
|
||||
this.emitAndKeepAlive('closed');
|
||||
};
|
||||
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<div ng-controller="SidebarController" ng-init="getWallets()">
|
||||
<div ng-controller="SidebarController" ng-init="init()">
|
||||
<header>
|
||||
<div ng-click="toggleWalletSelection()">
|
||||
<div class="col1">
|
||||
|
@ -101,7 +101,10 @@
|
|||
</li>
|
||||
<li>
|
||||
<a href="#!/" class="db p20h nav-item" title="Close"
|
||||
ng-click="signout()"><i class="size-24 m20r fi-power"></i> {{'Close'|translate}}</a>
|
||||
ng-click="signout()">
|
||||
<span ng-if="!hasPin"><i class="size-24 m20r fi-power"></i> {{'Close'|translate}}</span>
|
||||
<span ng-if="hasPin"><i class="size-24 m20r fi-lock"></i> {{'Lock'|translate}}</span>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
<div class="text-gray size-12 text-center columns">
|
||||
|
|
Loading…
Reference in New Issue