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

Merge pull request #4384 from JDonadio/bug/edit-button

Browse source 
Edit button - Addressbook
This commit is contained in:
Matias Alejo Garcia 2016-06-14 16:03:24 -03:00 • committed by GitHub
commit 4463c7e8a8
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
public/views/modals/addressbook.html
View file

@ -14,7 +14,7 @@
</h1>
</section>
<section class="right-small" ng-show="!selectedWalletsOpt" ng-click="toggleEditAddressbook()">
<section class="right-small" ng-show="!selectedWalletsOpt && !isEmptyList" ng-click="toggleEditAddressbook()">
<a ng-show="!editAddressbook && !addAddressbookEntry" href class="p10">
<span class="text-close" translate>Edit</span>
</a>
@ -73,7 +73,7 @@
</div>
<div ng-show="!selectedWalletsOpt" class="m20b">
<ul ng-show="!addAddressbookEntry" class="no-bullet m0" ng-init="list()">
<ul ng-show="!addAddressbookEntry" class="no-bullet m0" ng-init="contactList()">
<li class="p10 line-b" ng-repeat="(addr, label) in list">
<a ng-show="selectedAddressbook[addr]" class="removeAddressbook" ng-click="remove(addr)" translate>Remove</a>
<a ng-show="editAddressbook" class="selectAddressbook" ng-click="toggleSelectAddressbook(addr)">
@ -123,7 +123,8 @@
<input type="button" class="button expand outline dark-gray round" ng-click="toggleAddAddressbookEntry()" value="{{'Cancel'|translate}}">
</div>
<div class="columns large-6 medium-6 small-6">
<input type="submit" class="button expand round black" ng-click="add(addressbook)" value="{{'Save'|translate}}" ng-disabled="!addressbookForm.$valid">
<input type="submit" class="button expand round black" ng-click="add(addressbook)" value="{{'Save'|translate}}"
ng-disabled="!addressbookForm.$valid" ng-style="{'background-color':color}">
</div>
</div>
</form>

9
src/js/controllers/modals/addressbook.js
View file

@ -1,6 +1,6 @@
'use strict';
angular.module('copayApp.controllers').controller('addressbookController', function($rootScope, $scope, $timeout, profileService, addressService, addressbookService, bwsError) {
angular.module('copayApp.controllers').controller('addressbookController', function($rootScope, $scope, $timeout, lodash, profileService, addressService, addressbookService, bwsError) {
var self = $scope.self;
var fc = profileService.focusedClient;
@ -68,7 +68,7 @@ angular.module('copayApp.controllers').controller('addressbookController', funct
$scope.addAddressbookEntry = !$scope.addAddressbookEntry;
};
$scope.list = function() {
$scope.contactList = function() {
$scope.error = null;
addressbookService.list(function(err, ab) {
if (err) {
@ -76,6 +76,7 @@ angular.module('copayApp.controllers').controller('addressbookController', funct
return;
}
$scope.list = ab;
$scope.isEmptyList = lodash.isEmpty($scope.list);
$timeout(function() {
$scope.$digest();
});
@ -92,6 +93,7 @@ angular.module('copayApp.controllers').controller('addressbookController', funct
}
$rootScope.$emit('Local/AddressbookUpdated', ab);
$scope.list = ab;
$scope.isEmptyList = lodash.isEmpty($scope.list);
$scope.editAddressbook = true;
$scope.toggleEditAddressbook();
$scope.$digest();
@ -109,6 +111,9 @@ angular.module('copayApp.controllers').controller('addressbookController', funct
}
$rootScope.$emit('Local/AddressbookUpdated', ab);
$scope.list = ab;
$scope.isEmptyList = lodash.isEmpty($scope.list);
if ($scope.isEmptyList)
$scope.editAddressbook = false;
$scope.$digest();
});
}, 100);