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

fix join / export\

Browse source
This commit is contained in:
Matias Alejo Garcia 2015-01-03 21:04:00 -03:00
commit 1902e01267
10 changed files with 41 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

16
index.html
View file

@ -1,4 +1,4 @@
<!doctype html> <!doctype html>
<html lang="en" ng-app="copayApp" ng-csp> <html lang="en" ng-app="copayApp" ng-csp>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
@ -83,14 +83,14 @@
<a class="left-off-canvas-toggle menu-icon" ><span></span></a> <a class="left-off-canvas-toggle menu-icon" ><span></span></a>
</section> </section>
<section class="right-small" ng-show="$root.iden && $root.wallet.isComplete()"> <section class="right-small" ng-show="$root.iden && $root.wallet.isComplete() && !$root.hideWalletNavigation">
<a class="p10" ng-click="$root.go('more')"><i class="fi-widget size-24"></i></a> <a class="p10" ng-click="$root.go('more')"><i class="fi-widget size-24"></i></a>
</section> </section>
<section class="middle tab-bar-section"> <section class="middle tab-bar-section">
<h1 class="title ellipsis" ng-show="$root.iden && $root.wallet"> <h1 class="title ellipsis" ng-show="$root.iden && $root.wallet && !$root.hideWalletNavigation">
{{$root.wallet.getName()}} {{$root.wallet.getName()}}
</h1> </h1>
</section> </section>
</nav> </nav>
@ -103,7 +103,7 @@
role='navigation' role='navigation'
class="sidebar"></div> class="sidebar"></div>
<div class="bottom-bar" ng-if="$root.wallet && <div class="bottom-bar" ng-if="$root.wallet &&
$root.wallet.isComplete() && !$root.wallet.isLocked"> $root.wallet.isComplete() && !$root.wallet.isLocked && !$root.hideWalletNavigation">
<div ng-include="'views/includes/bottombar-mobile.html'"></div> <div ng-include="'views/includes/bottombar-mobile.html'"></div>
</div> </div>
</div> </div>

11
js/controllers/create.js
View file

@ -1,15 +1,17 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('CreateController', angular.module('copayApp.controllers').controller('CreateController',
function($scope, $rootScope, $location, $timeout, identityService, backupService, notification, defaults) { function($scope, $rootScope, $location, $timeout, identityService, backupService, notification, defaults, isMobile, isCordova) {
$rootScope.fromSetup = true; $rootScope.fromSetup = true;
$scope.loading = false; $scope.loading = false;
$scope.walletPassword = $rootScope.walletPassword; $scope.walletPassword = $rootScope.walletPassword;
$scope.isMobile = !!window.cordova; $scope.isMobile = isMobile.any();
$scope.hideAdv = true; $scope.hideAdv = true;
$scope.networkName = config.networkName; $scope.networkName = config.networkName;
$rootScope.title = 'Create new wallet'; $rootScope.title = 'Create new wallet';
$rootScope.hideWalletNavigation = true;
$scope.isWindowsPhoneApp = isMobile.Windows() && isCordova;
// ng-repeat defined number of times instead of repeating over array? // ng-repeat defined number of times instead of repeating over array?
$scope.getNumber = function(num) { $scope.getNumber = function(num) {
@ -39,6 +41,7 @@ angular.module('copayApp.controllers').controller('CreateController',
return $scope.networkUrl != defaults.network.livenet.url && $scope.networkUrl != defaults.network.testnet.url; return $scope.networkUrl != defaults.network.livenet.url && $scope.networkUrl != defaults.network.testnet.url;
}; };
$scope.create = function(form) { $scope.create = function(form) {
if (form && form.$invalid) { if (form && form.$invalid) {
$scope.error = 'Please enter the required fields'; $scope.error = 'Please enter the required fields';
@ -68,4 +71,8 @@ angular.module('copayApp.controllers').controller('CreateController',
},1); },1);
}); });
}; };
$scope.$on("$destroy", function () {
$rootScope.hideWalletNavigation = false;
});
}); });

2
js/controllers/createProfile.js
View file

@ -19,8 +19,6 @@ angular.module('copayApp.controllers').controller('CreateProfileController', fun
$scope.minPasswordStrength = _.isUndefined(config.minPasswordStrength) ? $scope.minPasswordStrength = _.isUndefined(config.minPasswordStrength) ?
4 : config.minPasswordStrength; 4 : config.minPasswordStrength;
//TODO
$scope.minPasswordStrength = 1;
pinService.makePinInput($scope, 'newpin', function(newValue) { pinService.makePinInput($scope, 'newpin', function(newValue) {
_firstpin = newValue; _firstpin = newValue;

4
js/controllers/homeWallet.js
View file

@ -2,7 +2,9 @@
angular.module('copayApp.controllers').controller('HomeWalletController', function($scope, $rootScope, $timeout, $filter, $modal, rateService, notification, txStatus, identityService) { angular.module('copayApp.controllers').controller('HomeWalletController', function($scope, $rootScope, $timeout, $filter, $modal, rateService, notification, txStatus, identityService) {
$scope.initHome = function() { $scope.initHome = function() {
$rootScope.title = 'Home'; $rootScope.title = 'Home';
$rootScope.hideWalletNavigation = false;
var w = $rootScope.wallet; var w = $rootScope.wallet;
$scope.isShared = w.isShared(); $scope.isShared = w.isShared();
$scope.requiresMultipleSignatures = w.requiresMultipleSignatures(); $scope.requiresMultipleSignatures = w.requiresMultipleSignatures();

8
js/controllers/import.js
View file

@ -9,6 +9,8 @@ angular.module('copayApp.controllers').controller('ImportController',
$scope.isSafari = isMobile.Safari(); $scope.isSafari = isMobile.Safari();
$scope.isCordova = isCordova; $scope.isCordova = isCordova;
$scope.importOpts = {}; $scope.importOpts = {};
$rootScope.hideWalletNavigation = true;
window.ignoreMobilePause = true; window.ignoreMobilePause = true;
$scope.$on('$destroy', function() { $scope.$on('$destroy', function() {
@ -96,4 +98,10 @@ angular.module('copayApp.controllers').controller('ImportController',
}); });
} }
}; };
$scope.$on("$destroy", function () {
$rootScope.hideWalletNavigation = false;
});
}); });

7
js/controllers/join.js
View file

@ -6,6 +6,8 @@ angular.module('copayApp.controllers').controller('JoinController',
$scope.loading = false; $scope.loading = false;
$scope.isMobile = isMobile.any(); $scope.isMobile = isMobile.any();
$rootScope.title = 'Join shared wallet'; $rootScope.title = 'Join shared wallet';
$rootScope.hideWalletNavigation = true;
// QR code Scanner // QR code Scanner
var cameraInput; var cameraInput;
@ -150,4 +152,9 @@ angular.module('copayApp.controllers').controller('JoinController',
$timeout(function () { $scope.$digest(); }, 1); $timeout(function () { $scope.$digest(); }, 1);
}); });
} }
$scope.$on("$destroy", function () {
$rootScope.hideWalletNavigation = false;
});
}); });

5
js/controllers/send.js
View file

@ -15,9 +15,6 @@ angular.module('copayApp.controllers').controller('SendController',
$scope.isMobile = isMobile.any(); $scope.isMobile = isMobile.any();
$scope.isWindowsPhoneApp = isMobile.Windows() && isCordova; $scope.isWindowsPhoneApp = isMobile.Windows() && isCordova;
// TODO
$scope.isWindowsPhoneApp = 1;
$rootScope.wpInputFocused = false; $rootScope.wpInputFocused = false;
$scope.isShared = w.isShared(); $scope.isShared = w.isShared();
@ -73,7 +70,7 @@ angular.module('copayApp.controllers').controller('SendController',
} }
$timeout(function() { $timeout(function() {
$rootScope.$digest(); $rootScope.$digest();
}, 100); }, 1);
}; };
$scope.setInputs = function() { $scope.setInputs = function() {

7
views/create.html
View file

@ -3,11 +3,6 @@
<div ng-include="'views/includes/loading.html'" ng-init="title = 'Creating wallet'"></div> <div ng-include="'views/includes/loading.html'" ng-init="title = 'Creating wallet'"></div>
</div> </div>
<div class="setup" ng-show="!loading && !$root.starting"> <div class="setup" ng-show="!loading && !$root.starting">
<div class="row hide-for-large-up">
<div class="medium-12 small-12 columns">
<h1>{{$root.title}}</h1>
</div>
</div>
<form name="setupForm" ng-submit="create(setupForm)" novalidate> <form name="setupForm" ng-submit="create(setupForm)" novalidate>
<div class="row"> <div class="row">
<div class="large-12 columns"> <div class="large-12 columns">
@ -24,7 +19,7 @@
<div class="panel"> <div class="panel">
<label><span translate>Wallet name</span> <label><span translate>Wallet name</span>
<div class="input"> <div class="input">
<input type="text" placeholder="{{'Family vacation funds'|translate}}" class="form-control" ng-model="walletName" ng-required="true"> <input type="text" placeholder="{{'Family vacation funds'|translate}}" class="form-control" ng-model="walletName" ng-required="true">
</div> </div>
</label> </label>
<div class="row"> <div class="row">

1
views/createProfile.html
View file

@ -149,6 +149,7 @@
<form ng-show="createStep == 'pass'" name="passForm" ng-submit="createProfile(passForm)" novalidate> <form ng-show="createStep == 'pass'" name="passForm" ng-submit="createProfile(passForm)" novalidate>
<div class="box-notification" ng-show="passwordStrength"> <div class="box-notification" ng-show="passwordStrength">
<!-- if you change this, check it on WP...-->
<div class="box-icon" ng-if="passwordStrength.strength< minPasswordStrength" style="background-color:#dd514c"> <div class="box-icon" ng-if="passwordStrength.strength< minPasswordStrength" style="background-color:#dd514c">
<i class="fi-x size-24"></i> <i class="fi-x size-24"></i>
</div> </div>