From c6f8018cc16681ea941f4ff4095440975ace5c61 Mon Sep 17 00:00:00 2001 From: plondon Date: Fri, 15 Jan 2016 13:58:55 -0500 Subject: [PATCH] fix(SecurityCenter): clicking mobile cancel number will toggle the active state of the form --- app/partials/security-center.jade | 2 +- assets/css/modules/_security-center.scss | 2 ++ assets/js/controllers/securityCenter.controller.js | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/partials/security-center.jade b/app/partials/security-center.jade index 2275a700ca..b63878d800 100644 --- a/app/partials/security-center.jade +++ b/app/partials/security-center.jade @@ -109,7 +109,7 @@ .badge-panel(ng-show="display.action == 'mobilenumber' || display.action == 'twofactor'") div(ng-show="display.action == 'mobilenumber'") - configure-mobile-number(on-success="mobileNumber.step = 2" on-cancel="mobileNumber.step = 0" ng-show="mobileNumber.step == 1" button-lg full-width) + configure-mobile-number(on-success="mobileNumber.step = 2" on-cancel="mobileNumber.step = 1; cancelNumber();" ng-show="mobileNumber.step == 1" button-lg full-width) div(ng-show="mobileNumber.step == 2") h2.status.complete.hidden-xs.long-input verify-mobile-number(on-success="mobileNumber.step = 0" button-lg full-width) diff --git a/assets/css/modules/_security-center.scss b/assets/css/modules/_security-center.scss index f4b323874d..80f2319b1a 100644 --- a/assets/css/modules/_security-center.scss +++ b/assets/css/modules/_security-center.scss @@ -149,8 +149,10 @@ } .badge-panel { border: 1px solid rgb(234, 234, 234); + position: relative; border-top: none; padding: 30px; + z-index: 10; input { border: none; border-bottom: 1px solid #DBDBDB; diff --git a/assets/js/controllers/securityCenter.controller.js b/assets/js/controllers/securityCenter.controller.js index 74208daf81..b63f7255d5 100644 --- a/assets/js/controllers/securityCenter.controller.js +++ b/assets/js/controllers/securityCenter.controller.js @@ -68,6 +68,10 @@ function SettingsSecurityCenterCtrl($scope, Wallet, SecurityCenter, filterFilter Wallet.changePasswordHint(hint, success, error); }; + $scope.cancelNumber = () => { + $scope.toggle('mobilenumber'); + } + $scope.$watchCollection("user", (newValue, oldValue) => { if (!($scope.display.action === "mobilenumber" && !$scope.user.isMobileVerified)) { $scope.nextAction();