Fix Conflicts:

js/models/core/WalletFactory.js
This commit is contained in:
Gustavo Cortez 2014-06-18 10:03:22 -03:00
commit 21baa103bd
13 changed files with 346 additions and 137 deletions

View file

@ -1,7 +1,7 @@
'use strict';
angular.module('copayApp.controllers').controller('BackupController',
function($scope, $rootScope, $location, $window, $timeout, $modal, backupService) {
function($scope, $rootScope, $location, $window, $timeout, $modal, backupService, walletFactory, controllerUtils) {
$scope.title = 'Backup';
$scope.download = function() {
@ -19,6 +19,14 @@ angular.module('copayApp.controllers').controller('BackupController',
});
};
$scope.deleteWallet = function() {
var w = $rootScope.wallet;
w.disconnect();
walletFactory.delete(w.id, function() {
controllerUtils.logout();
});
};
});
var ModalInstanceCtrl = function($scope, $modalInstance) {

View file

@ -1,7 +1,7 @@
'use strict';
angular.module('copayApp.controllers').controller('HeaderController',
function($scope, $rootScope, $location, $notification, $http, walletFactory, controllerUtils) {
function($scope, $rootScope, $location, $notification, $http, controllerUtils) {
$scope.menu = [
{
'title': 'Addresses',