mirror of https://github.com/BTCPrivate/copay.git
Fix buttons. Remove console.logs. isMobile active!!
This commit is contained in:
Gustavo Maximiliano Cortez
parent
1d7e9dda93
commit
5329d030f8
|
|
@ -86,10 +86,9 @@ angular.module('copayApp.controllers').controller('CreateProfileController', fun
|
|||
},1);
|
||||
$scope.error = msg;
|
||||
} else {
|
||||
$scope.error = null;
|
||||
$scope.error = null;
|
||||
// mobile
|
||||
//if (isMobile.any()) {
|
||||
if (true) {
|
||||
if (isMobile.any()) {
|
||||
_credentials = {
|
||||
email: form.email.$modelValue,
|
||||
password: form.password.$modelValue,
|
||||
|
|
@ -100,7 +99,6 @@ angular.module('copayApp.controllers').controller('CreateProfileController', fun
|
|||
$rootScope.$digest();
|
||||
}, 1);
|
||||
|
||||
console.log('[createProfile.js.70]'); //TODO
|
||||
return;
|
||||
} else {
|
||||
$scope.createDefaultWallet();
|
||||
|
|
|
|||
|
|
@ -41,16 +41,15 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc
|
|||
if (newValue === _firstpin) {
|
||||
_firstpin = null;
|
||||
$scope.createPin(newValue);
|
||||
} else {
|
||||
} else {
|
||||
$scope.$$childTail.setPinForm.newpin.$setViewValue('');
|
||||
$scope.$$childTail.setPinForm.newpin.$render();
|
||||
$scope.$$childTail.setPinForm.repeatpin.$setViewValue('');
|
||||
$scope.$$childTail.setPinForm.repeatpin.$render();
|
||||
|
||||
_firstpin = null;
|
||||
$scope.error = 'Entered PINs were not equal. Try again';
|
||||
$scope.askForPin = 1;
|
||||
|
||||
$scope.setPinForm.newpin.$setViewValue('');
|
||||
$scope.setPinForm.newpin.$render();
|
||||
$scope.setPinForm.repeatpin.$setViewValue('');
|
||||
$scope.setPinForm.repeatpin.$render();
|
||||
$scope.setPinForm.$setPristine();
|
||||
$scope.error = 'Entered PINs were not equal. Try again';
|
||||
}
|
||||
});
|
||||
|
||||
|
|
@ -155,11 +154,11 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc
|
|||
|
||||
// Open successfully?
|
||||
if (iden) {
|
||||
$scope.error = null;
|
||||
$scope.confirmedEmail = false;
|
||||
|
||||
// mobile
|
||||
//if (isMobile.any() && !$rootScope.hasPin) {
|
||||
if (true && !$rootScope.hasPin) {
|
||||
if (isMobile.any() && !$rootScope.hasPin) {
|
||||
$scope.done();
|
||||
_credentials = {
|
||||
email: email,
|
||||
|
|
|
|||
|
|
@ -55,12 +55,10 @@ angular.module('copayApp.services')
|
|||
failIfExists: true,
|
||||
}, function(err, iden) {
|
||||
|
||||
console.log('[identityService.js.57]'); //TODO
|
||||
if (err) return cb(err);
|
||||
preconditions.checkState(iden);
|
||||
root.bind(iden);
|
||||
|
||||
console.log('[identityService.js.62]'); //TODO
|
||||
return cb(null);
|
||||
});
|
||||
};
|
||||
|
|
|
|||
|
|
@ -96,44 +96,43 @@
|
|||
<div class="large-4 large-centered medium-6 medium-centered columns" ng-show="!loading && askForPin">
|
||||
<div class="box-setup">
|
||||
<h1><span translate>Set up a </span> <b> PIN </b>?</h1>
|
||||
<p class="size-14">Enter a 4-digit number for easier access from this device
|
||||
<p class="size-14">Enter a 4-digit number for easier access from this device</p>
|
||||
|
||||
<div class="box-notification" ng-show="error">
|
||||
<div class="box-icon error">
|
||||
<i class="fi-x size-24"></i>
|
||||
</div>
|
||||
<span class="text-warning size-14">
|
||||
<div class="box-notification" ng-show="error">
|
||||
<div class="box-icon error">
|
||||
<i class="fi-x size-24"></i>
|
||||
</div>
|
||||
<span class="text-warning size-14">
|
||||
{{error|translate}}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<form name="setPinForm" ng-submit="createPin(setPinForm)" novalidate>
|
||||
<div class="input" ng-show="askForPin == 1">
|
||||
<input id="newpin" type="tel" ng-model="newpin" class="form-control" ng-maxlength="4" ng-minlength="4" maxlength="4" ng-pattern="/^[0-9]{1,4}$/" placeholder="PIN" name="newpin" required show-focus="askForPin == 1">
|
||||
<i class="icon-locked"></i>
|
||||
</div>
|
||||
<div class="input" ng-show="askForPin == 2">
|
||||
<input id="repeatpin" type="tel" ng-model="repeatpin" class="form-control" ng-maxlength="4" ng-minlength="4" maxlength="4" ng-pattern="/^[0-9]{1,4}$/" placeholder="Confirm your PIN" name="repeatpin" required show-focus="askForPin == 2">
|
||||
<i class="icon-locked"></i>
|
||||
</div>
|
||||
|
||||
<form name="setPinForm" ng-submit="createPin(setPinForm)" novalidate>
|
||||
<div class="input" ng-show="askForPin == 1">
|
||||
<input id="newpin" type="tel" ng-model="newpin" class="form-control" ng-maxlength="4" ng-minlength="4" maxlength="4" ng-pattern="/^[0-9]{1,4}$/" placeholder="PIN" name="newpin" required show-focus="askForPin == 1">
|
||||
<i class="icon-locked"></i>
|
||||
</div>
|
||||
<div class="input" ng-show="askForPin == 2">
|
||||
<input id="repeatpin" type="tel" ng-model="repeatpin" class="form-control" ng-maxlength="4" ng-minlength="4" maxlength="4" ng-pattern="/^[0-9]{1,4}$/" placeholder="Confirm your PIN" name="repeatpin" required show-focus="askForPin == 2">
|
||||
<i class="icon-locked"></i>
|
||||
</div>
|
||||
|
||||
<button translate type="submit" class="dn button primary radius expand m0" ng-disabled="setPinForm.$invalid || error">
|
||||
Set pin
|
||||
</button>
|
||||
</form>
|
||||
<div class="box-setup-footer row collapse">
|
||||
<div class="large-6 medium-6 small-6 columns text-right">
|
||||
<div class="large-6 medium-6 small-6 columns">
|
||||
<a class="button secondary radius m0" ng-click="createDefaultWallet()">
|
||||
<span translate>Skip</span>
|
||||
</a>
|
||||
</div>
|
||||
<div class="large-6 medium-6 small-6 columns text-right">
|
||||
<a class="button secondary radius m0">
|
||||
<span translate>OK</span>
|
||||
</a>
|
||||
<button translate type="submit" class="button primary radius expand m0"
|
||||
ng-disabled="setPinForm.$invalid || error">
|
||||
OK
|
||||
</button>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@
|
|||
|
||||
<div class="box-setup" ng-if="askForPin">
|
||||
<h1><span translate>Set up a </span> <b> PIN </b>?</h1>
|
||||
<p class="size-14"> Enter a 4-digit number for easier access from this device
|
||||
<p class="size-14"> Enter a 4-digit number for easier access from this device</p>
|
||||
|
||||
<div class="box-notification" ng-show="error">
|
||||
<div class="box-icon error">
|
||||
|
|
@ -60,7 +60,7 @@
|
|||
</span>
|
||||
</div>
|
||||
|
||||
<form name="setPinForm" ng-submit="createPin(setPinForm)" novalidate>
|
||||
<form name="setPinForm" ng-model="setPinForm" ng-submit="createPin(setPinForm)" novalidate>
|
||||
<div class="input" ng-show="askForPin == 1">
|
||||
<input id="newpin" type="tel" ng-model="newpin" class="form-control"
|
||||
ng-maxlength="4" ng-minlength="4" maxlength="4"
|
||||
|
|
@ -76,24 +76,22 @@
|
|||
<i class="icon-locked"></i>
|
||||
</div>
|
||||
|
||||
<button translate type="submit" class="dn button primary radius expand m0"
|
||||
ng-disabled="setPinForm.$invalid || error">
|
||||
Set pin
|
||||
</button>
|
||||
</form>
|
||||
<div class="box-setup-footer row collapse">
|
||||
<div class="large-6 medium-6 small-6 columns text-right">
|
||||
<a class="button secondary radius m0" ng-click="openWallets()">
|
||||
<span translate>Skip</span>
|
||||
</a>
|
||||
<div class="box-setup-footer row collapse">
|
||||
<div class="large-6 medium-6 small-6 columns">
|
||||
<a class="button secondary radius m0" ng-click="openWallets()">
|
||||
<span translate>Skip</span>
|
||||
</a>
|
||||
</div>
|
||||
<div class="large-6 medium-6 small-6 columns text-right">
|
||||
<button translate type="submit" class="button primary radius expand m0"
|
||||
ng-disabled="setPinForm.$invalid || error">
|
||||
OK
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="large-6 medium-6 small-6 columns text-right">
|
||||
<a class="button secondary radius m0">
|
||||
<span translate>OK</span>
|
||||
</a>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<div class="box-setup" ng-if='$root.hasPin'>
|
||||
|
|
@ -115,18 +113,22 @@
|
|||
placeholder="Pin number" name="pin" required auto-focus>
|
||||
<i class="icon-locked"></i>
|
||||
</div>
|
||||
|
||||
<button translate type="submit" class="button primary radius expand m0"
|
||||
ng-disabled="pinForm.$invalid || error">
|
||||
Sign in
|
||||
</button>
|
||||
</form>
|
||||
<div class="box-setup-footer">
|
||||
<a class="button warning radius m0" ng-click="pinLogout()">
|
||||
<i class="icon-power"></i>
|
||||
<span translate>Logout</span>
|
||||
</a>
|
||||
</div>
|
||||
|
||||
<div class="box-setup-footer row collapse">
|
||||
<div class="large-6 medium-6 small-6 columns">
|
||||
<a class="button warning radius m0" ng-click="pinLogout()">
|
||||
<i class="icon-power"></i>
|
||||
<span translate>Logout</span>
|
||||
</a>
|
||||
</div>
|
||||
<div class="large-6 medium-6 small-6 columns text-right">
|
||||
<button translate type="submit" class="button primary radius expand m0"
|
||||
ng-disabled="pinForm.$invalid || error">
|
||||
Sign in
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue