From 37c7430acff30ed053403900f419ec28b6e719e8 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Mon, 19 Jan 2015 16:20:43 -0300 Subject: [PATCH] Show errors if occur when creating profile --- js/controllers/createProfile.js | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/js/controllers/createProfile.js b/js/controllers/createProfile.js index a34ad8796..05477f881 100644 --- a/js/controllers/createProfile.js +++ b/js/controllers/createProfile.js @@ -139,7 +139,6 @@ angular.module('copayApp.controllers').controller('CreateProfileController', fun $rootScope.hideNavigation = false; identityService.create(emailOrUsername, password, function(err) { - $scope.error = null; if (err) { var msg = err.toString(); $scope.createStep = 'email'; @@ -149,8 +148,7 @@ angular.module('copayApp.controllers').controller('CreateProfileController', fun if (msg.indexOf('EMAILERROR') >= 0) { msg = 'Could not send verification email. Please check your email address.'; } - $scope.error = msg; - $scope.passwordStrength = null; + return cb(msg); } else { // mobile if ($scope.isMobile) { @@ -202,12 +200,18 @@ angular.module('copayApp.controllers').controller('CreateProfileController', fun $rootScope.starting = true; $scope._doCreateProfile($scope.userOrEmail, form.password.$modelValue, function(err) { + if (err) { + $scope.error = err; + $scope.passwordStrength = null; + $rootScope.starting = false; + } + form.password.$setViewValue(''); + form.password.$render(); + form.repeatpassword.$setViewValue(''); + form.repeatpassword.$render(); + form.$setPristine(); $timeout(function() { - form.password.$setViewValue(''); - form.password.$render(); - form.repeatpassword.$setViewValue(''); - form.repeatpassword.$render(); - form.$setPristine(); + $rootScope.$digest(); }, 1); }); });