From 70bd476fa81e1a5b163d89f4d3d3dce6f7b83239 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 9 Dec 2014 18:49:37 -0300 Subject: [PATCH] add loading to submit button --- js/controllers/createProfile.js | 4 +++- js/controllers/home.js | 3 +++ views/createProfile.html | 4 +++- views/home.html | 4 +++- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/js/controllers/createProfile.js b/js/controllers/createProfile.js index bd857cd46..0ceae09fa 100644 --- a/js/controllers/createProfile.js +++ b/js/controllers/createProfile.js @@ -40,12 +40,14 @@ angular.module('copayApp.controllers').controller('CreateProfileController', fun preconditions.checkArgument(pin); preconditions.checkState($rootScope.iden); preconditions.checkState(_credentials && _credentials.email); + $scope.loading = true; pinService.save(pin, _credentials.email, _credentials.password, function(err) { _credentials.password = ''; _credentials = null; $scope.askForPin = 0; $rootScope.hasPin = true; + $scope.loading = null; $scope.createDefaultWallet(); }); }; @@ -106,7 +108,7 @@ angular.module('copayApp.controllers').controller('CreateProfileController', fun $scope.loading = true; identityService.create(emailOrUsername, password, function(err) { - $scope.loading = false; + $scope.loading = null; $scope.error = null; if (err) { var msg = err.toString(); diff --git a/js/controllers/home.js b/js/controllers/home.js index 9a2d99e17..abe9744b8 100644 --- a/js/controllers/home.js +++ b/js/controllers/home.js @@ -67,6 +67,7 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc $scope.error = 'Please enter the required fields'; return; } + $scope.loading = true; $rootScope.starting = true; var credentials = pinService.get(pin, function(err, credentials) { @@ -93,12 +94,14 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc preconditions.checkArgument(pin); preconditions.checkState($rootScope.iden); preconditions.checkState(_credentials && _credentials.email); + $scope.loading = true; pinService.save(pin, _credentials.email, _credentials.password, function(err) { _credentials.password = ''; _credentials = null; $scope.askForPin = 0; $rootScope.hasPin = true; + $scope.loading = null; $scope.openWallets(); }); }; diff --git a/views/createProfile.html b/views/createProfile.html index 6cca20c91..c2da6cd7b 100644 --- a/views/createProfile.html +++ b/views/createProfile.html @@ -230,7 +230,9 @@
-
diff --git a/views/home.html b/views/home.html index e6d096795..268c39882 100644 --- a/views/home.html +++ b/views/home.html @@ -68,7 +68,9 @@
-