Merge pull request #1239 from matiu/bug/create
rename #setup to #create
This commit is contained in:
commit
21d7ea5411
5 changed files with 9 additions and 9 deletions
|
|
@ -32,7 +32,7 @@ var valid_pairs = {
|
|||
'1,12': 489
|
||||
};
|
||||
|
||||
angular.module('copayApp.controllers').controller('SetupController',
|
||||
angular.module('copayApp.controllers').controller('CreateController',
|
||||
function($scope, $rootScope, $location, $timeout, walletFactory, controllerUtils, Passphrase, backupService, notification) {
|
||||
controllerUtils.redirIfLogged();
|
||||
|
||||
|
|
@ -22,8 +22,8 @@ angular
|
|||
templateUrl: 'views/import.html',
|
||||
validate: false
|
||||
})
|
||||
.when('/setup', {
|
||||
templateUrl: 'views/setup.html',
|
||||
.when('/create', {
|
||||
templateUrl: 'views/create.html',
|
||||
validate: false
|
||||
})
|
||||
.when('/copayers', {
|
||||
|
|
|
|||
|
|
@ -65,11 +65,11 @@ describe("Unit: Controllers", function() {
|
|||
});
|
||||
});
|
||||
|
||||
describe('Setup Controller', function() {
|
||||
var setupCtrl;
|
||||
describe('Create Controller', function() {
|
||||
var c;
|
||||
beforeEach(inject(function($controller, $rootScope) {
|
||||
scope = $rootScope.$new();
|
||||
setupCtrl = $controller('SetupController', {
|
||||
c = $controller('CreateController', {
|
||||
$scope: scope,
|
||||
});
|
||||
}));
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<div ng-controller="SetupController">
|
||||
<div ng-controller="CreateController">
|
||||
<div data-alert class="loading-screen" ng-show="loading">
|
||||
<i class="size-60 fi-bitcoin-circle icon-rotate spinner"></i>
|
||||
Creating wallet...
|
||||
|
|
@ -9,13 +9,13 @@
|
|||
<a class="text-white" href="#!/open">Open a wallet</a>
|
||||
</div>
|
||||
<div class="button-setup" ng-show="!hasWallets">
|
||||
<a class="text-secondary" href="#!/setup">Create a new wallet</a>
|
||||
<a class="text-secondary" href="#!/create">Create a new wallet</a>
|
||||
</div>
|
||||
<div class="button-setup">
|
||||
<a class="text-primary" href="#!/join">Join a Wallet in Creation</a>
|
||||
</div>
|
||||
<div class="button-setup" ng-show="hasWallets">
|
||||
<a class="text-secondary" href="#!/setup">Create a wallet</a>
|
||||
<a class="text-secondary" href="#!/create">Create a wallet</a>
|
||||
</div>
|
||||
|
||||
<div class="footer-setup">
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue