BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

askForPin scope

This commit is contained in:
Gustavo Maximiliano Cortez 2015-01-29 03:14:32 -03:00
parent e2bc1eb86a
commit d5a9a916db
5 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/controllers/createProfile.js
View File

@ -14,7 +14,7 @@ angular.module('copayApp.controllers').controller('CreateProfileController', fun
$scope.hideForWP = 0;
$scope.digits = [];
$scope.defined = [];
$rootScope.askForPin = 0;
$scope.askForPin = 0;
$scope.createStep = 'storage';
$scope.useLocalstorage = false;
@ -53,7 +53,7 @@ angular.module('copayApp.controllers').controller('CreateProfileController', fun
pinService.save(pin, _credentials.email, _credentials.password, function(err) {
_credentials.password = '';
_credentials = null;
$rootScope.askForPin = 0;
$scope.askForPin = 0;
$rootScope.hasPin = true;
$scope.createDefaultWallet();
});
@ -100,7 +100,7 @@ angular.module('copayApp.controllers').controller('CreateProfileController', fun
$rootScope.hideNavigation = false;
$rootScope.starting = true;
identityService.createDefaultWallet(function(err) {
$rootScope.askForPin = 0;
$scope.askForPin = 0;
$rootScope.starting = null;
if (err) {
@ -140,7 +140,7 @@ angular.module('copayApp.controllers').controller('CreateProfileController', fun
email: emailOrUsername,
password: password,
};
$rootScope.askForPin = 1;
$scope.askForPin = 1;
$scope.hideForWP = 0;
$rootScope.hideNavigation = true;

6
js/controllers/home.js
View File

@ -13,7 +13,7 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc
$scope.attempt = 0;
$scope.digits = [];
$scope.defined = [];
$rootScope.askForPin = 0;
$scope.askForPin = 0;
// This is only for backwards compat, insight api should link to #!/confirmed directly
if (getParam('confirmed')) {
@ -113,7 +113,7 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc
pinService.save(pin, _credentials.email, _credentials.password, function(err) {
_credentials.password = '';
_credentials = null;
$rootScope.askForPin = 0;
$scope.askForPin = 0;
$rootScope.hasPin = true;
$rootScope.starting = null;
$scope.openWallets();
@ -183,7 +183,7 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc
email: email,
password: password,
};
$rootScope.askForPin = 1;
$scope.askForPin = 1;
$rootScope.starting = false;
$rootScope.hideNavigation = true;
$timeout(function() {

6
js/services/pinService.js
View File

@ -64,7 +64,7 @@ angular.module('copayApp.services')
if (!$rootScope.hasPin) {
if (!_firstpin) {
_firstpin = pin;
$rootScope.askForPin = 2;
scope.askForPin = 2;
$timeout(function() {
scope.clear();
}, 100);
@ -73,12 +73,12 @@ angular.module('copayApp.services')
else {
if (pin === _firstpin) {
_firstpin = null;
$rootScope.askForPin = null;
scope.askForPin = null;
scope.createPin(pin);
}
else {
_firstpin = null;
$rootScope.askForPin = 1;
scope.askForPin = 1;
$timeout(function() {
scope.clear();
scope.error = 'Entered PINs were not equal. Try again';

8
views/createProfile.html
View File

@ -1,6 +1,6 @@
<div class="createProfile" ng-controller="CreateProfileController" ng-init="init()">
<div ng-if="!$root.starting && $root.askForPin">
<div ng-if="!$root.starting && askForPin">
<div ng-include="'views/includes/pin-number.html'"></div>
</div>
@ -8,7 +8,7 @@
<div ng-include="'views/includes/loading.html'" ng-init="title = 'Creating profile'"></div>
</div>
<div class="row m20b" ng-show="!$root.starting && !$root.askForPin">
<div class="row m20b" ng-show="!$root.starting && !askForPin">
<div class="large-4 large-centered medium-7 medium-centered columns">
<div class="logo-setup hide-for-small-only" ng-hide="hideForWP">
<img src="img/logo-negative-beta.svg" alt="Copay" width="100">
@ -207,13 +207,13 @@
</div>
</div>
<div class="row m20b" ng-show="!$root.starting && $root.askForPin">
<div class="row m20b" ng-show="!$root.starting && askForPin">
<div class="large-4 large-centered medium-6 medium-centered columns">
<div class="clipo">
<img src="img/clipo-pin.png" alt="clipo" width="380">
</div>
<div class="text-white text-center" ng-show="$root.askForPin == 2">Repeat PIN</div>
<div class="text-white text-center" ng-show="askForPin == 2">Repeat PIN</div>
<div class="box-notification" ng-show="error">
<div class="box-icon error">
<i class="fi-x size-24"></i>

10
views/home.html
View File

@ -1,7 +1,7 @@
<div class="home" ng-controller="HomeController" ng-init="init()">
<div ng-if="$root.askForPin || ($root.hasPin && !$root.iden)">
<div ng-if="askForPin || ($root.hasPin && !$root.iden)">
<div ng-include="'views/includes/pin-number.html'"></div>
</div>
@ -58,12 +58,12 @@
</div>
</div>
<div ng-if='$root.askForPin || ($root.hasPin && !$root.iden)'>
<div ng-if='askForPin || ($root.hasPin && !$root.iden)'>
<div class="clipo">
<img src="img/clipo-pin-enter.png" alt="clipo" width="300" ng-show="$root.hasPin && !$root.iden">
<img src="img/clipo-pin.png" alt="clipo" width="380" ng-show="$root.askForPin">
<img src="img/clipo-pin.png" alt="clipo" width="380" ng-show="askForPin">
</div>
<div class="text-white text-center" ng-show="$root.askForPin == 2">Repeat PIN</div>
<div class="text-white text-center" ng-show="askForPin == 2">Repeat PIN</div>
<div class="box-notification" ng-show="error">
<div class="box-icon error">
<i class="fi-x size-24"></i>
@ -75,7 +75,7 @@
<div ng-include="'views/includes/pin.html'"></div>
</div>
<div ng-if='!$root.hasPin && !$root.askForPin && !$root.iden'>
<div ng-if='!$root.hasPin && !askForPin && !$root.iden'>
<div class="clipo" ng-hide="hideForWP">
<img src="img/clipo-signin.png" alt="clipo" width="310">
</div>